amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-09 05:25:26 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: eafd3c0c3b5dc6879988981674509a8d1ccfc286

Browse Source 
Monotone-Revision: b2324fd0b056d26c1f593b22e0516160fd06bd3c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-08-31T13:49:31
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-08-31 13:49:31 +00:00
parent f591023b2c
commit d4c7a0520a
23 changed files with 152 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Mailer/SOGoDraftObject.m
+13 -3
View File
@@ -186,7 +186,7 @@ static NSString *userAgent = nil;
{
id headerValue;
unsigned int count;
NSString *messageID, *priority;
NSString *messageID, *priority, *pureSender;
for (count = 0; count < 8; count++)
{
@@ -206,7 +206,6 @@ static NSString *userAgent = nil;
}
priority = [newHeaders objectForKey: @"priority"];
if (!priority || [priority isEqualToString: @"NORMAL"])
{
[headers removeObjectForKey: @"X-Priority"];
@@ -227,6 +226,15 @@ static NSString *userAgent = nil;
{
[headers setObject: @"5 (Lowest)" forKey: @"X-Priority"];
}
if ([[newHeaders objectForKey: @"receipt"] isEqualToString: @"true"])
{
pureSender = [[newHeaders objectForKey: @"from"] pureEMailAddress];
if (pureSender)
[headers setObject: pureSender forKey: @"Disposition-Notification-To"];
}
else
[headers removeObjectForKey: @"Disposition-Notification-To"];
}
- (NSDictionary *) headers
@@ -446,7 +454,6 @@ static NSString *userAgent = nil;
while ((currentAddress = [addresses nextObject]))
if ([currentAddress email])
[_ma addObject: [currentAddress email]];
}
- (void) _addRecipients: (NSArray *) recipients
@@ -1328,6 +1335,9 @@ static NSString *userAgent = nil;
if ([(s = [headers objectForKey: @"X-Priority"]) length] > 0)
[map setObject: s
forKey: @"X-Priority"];
if ([(s = [headers objectForKey: @"Disposition-Notification-To"]) length] > 0)
[map setObject: s
forKey: @"Disposition-Notification-To"];
[self _addHeaders: _headers toHeaderMap: map];