From bfe5cfe5f97767df78a67b45be2fd052da43d995 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 9 Dec 2010 19:41:28 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: d61deeadebd9f79f9603928dca395cad83167394 Monotone-Revision: 5d74c28ea0fcf5aa4d6ab7fc81f9bade5e4cfe5d Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2010-12-09T19:41:28 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/Mailer/SOGoDraftObject.m | 12 +----------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23c5c9735..7b283c6e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,10 @@ * SoObject/SOGo/SQLSource.m - added SHA password hash support for SQL authentication sources. * Added patch from bug #1048 + * SoObjects/Mailer/SOGoDraftObject.m: + -mimeHeaderMapWithHeaders:excluding: axed the "replyTo" + code as it was always 'empty', leading to Reply-To being + always set to the From: address, which is rather stupid. 2010-12-08 Francis Lachapelle diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m index 6c7d59a1a..420a9d387 100644 --- a/SoObjects/Mailer/SOGoDraftObject.m +++ b/SoObjects/Mailer/SOGoDraftObject.m @@ -1283,8 +1283,8 @@ static NSString *userAgent = nil; { NSString *s, *dateString; NGMutableHashMap *map; - id from, replyTo; NSArray *emails; + id from; map = [[[NGMutableHashMap alloc] initWithCapacity:16] autorelease]; @@ -1298,7 +1298,6 @@ static NSString *userAgent = nil; /* add senders */ from = [headers objectForKey: @"from"]; - replyTo = [headers objectForKey: @"replyTo"]; if (![self isEmptyValue:from]) { if ([from isKindOfClass:[NSArray class]]) @@ -1306,15 +1305,6 @@ static NSString *userAgent = nil; else [map setObject: [self _quoteSpecials: from] forKey: @"from"]; } - - if (![self isEmptyValue: replyTo]) { - if ([from isKindOfClass:[NSArray class]]) - [map setObjects: [self _quoteSpecialsInArray: from] forKey: @"reply-to"]; - else - [map setObject: [self _quoteSpecials: from] forKey: @"reply-to"]; - } - else if (![self isEmptyValue:from]) - [map setObjects: [map objectsForKey: @"from"] forKey: @"reply-to"]; if (inReplyTo) [map setObject: inReplyTo forKey: @"in-reply-to"];