Monotone-Parent: f90d169fbc251326ea6c8a2f620e125a8a7b4168

Monotone-Revision: 7786f49f6724383b92e91ba7998b99cfb52ceec3

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-20T13:27:21
This commit is contained in:
Wolfgang Sourdeau
2012-04-20 13:27:21 +00:00
parent 9ea333e6b6
commit fa4d2d3141
12 changed files with 135 additions and 65 deletions
+12 -2
View File
@@ -269,7 +269,7 @@ static NSString *userAgent = nil;
{
id headerValue;
unsigned int count;
NSString *messageID, *priority, *pureSender;
NSString *messageID, *priority, *pureSender,*replyTo;
for (count = 0; count < 8; count++)
{
@@ -310,6 +310,13 @@ static NSString *userAgent = nil;
[headers setObject: @"5 (Lowest)" forKey: @"X-Priority"];
}
replyTo = [headers objectForKey: @"replyTo"];
if ([replyTo length] > 0)
{
[headers setObject: replyTo forKey: @"reply-to"];
[headers removeObjectForKey: @"replyTo"];
}
if ([[newHeaders objectForKey: @"receipt"] isEqualToString: @"true"])
{
pureSender = [[newHeaders objectForKey: @"from"] pureEMailAddress];
@@ -1361,7 +1368,7 @@ static NSString *userAgent = nil;
NSString *s, *dateString;
NGMutableHashMap *map;
NSArray *emails;
id from;
id from, replyTo;
map = [[[NGMutableHashMap alloc] initWithCapacity:16] autorelease];
@@ -1383,6 +1390,9 @@ static NSString *userAgent = nil;
[map setObject: [self _quoteSpecials: from] forKey: @"from"];
}
if (replyTo = [headers objectForKey: @"reply-to"])
[map setObject: replyTo forKey: @"reply-to"];
if (inReplyTo)
[map setObject: inReplyTo forKey: @"in-reply-to"];