amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-29 16:59:29 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: f1e74651b8ca330587ba673947b6acdc782f1e56

Browse Source 
Monotone-Revision: f1b87d4db17a8caa13d51a72ad2dfbc796ac7d8f

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-12-05T21:02:57
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2007-12-05 21:02:57 +00:00
parent 896c85fb00
commit f431b1f55f
2 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2007-12-05 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/Mailer/SOGoDraftObject.m: The condition for replyToAll
has to be done later to avoid duplicated to and cc addresses.
2007-12-04 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m

42
SoObjects/Mailer/SOGoDraftObject.m
View File

@@ -466,27 +466,6 @@ static BOOL showTextAttachmentsInline = NO;
[self _addRecipients: addrs toArray: allRecipients];
[_info setObject: to forKey: @"to"];
/* CC processing if we reply-to-all: add all 'to' and 'cc' */
if (_replyToAll)
{
to = [NSMutableArray new];
[addrs setArray: [_envelope to]];
[self _purgeRecipients: allRecipients
fromAddresses: addrs];
[self _addEMailsOfAddresses: addrs toArray: to];
[self _addRecipients: addrs toArray: allRecipients];
[addrs setArray: [_envelope cc]];
[self _purgeRecipients: allRecipients
fromAddresses: addrs];
[self _addEMailsOfAddresses: addrs toArray: to];
[_info setObject: to forKey: @"cc"];
[to release];
}
/* If "to" is empty, we add at least ourself as a recipient!
This is for emails in the "Sent" folder that we reply to... */
if (![to count])
@@ -508,6 +487,27 @@ static BOOL showTextAttachmentsInline = NO;
[_info removeObjectForKey: @"cc"];
}
/* CC processing if we reply-to-all: add all 'to' and 'cc' */
if (_replyToAll)
{
to = [NSMutableArray new];
[addrs setArray: [_envelope to]];
[self _purgeRecipients: allRecipients
fromAddresses: addrs];
[self _addEMailsOfAddresses: addrs toArray: to];
[self _addRecipients: addrs toArray: allRecipients];
[addrs setArray: [_envelope cc]];
[self _purgeRecipients: allRecipients
fromAddresses: addrs];
[self _addEMailsOfAddresses: addrs toArray: to];
[_info setObject: to forKey: @"cc"];
[to release];
}
[allRecipients release];
[addrs release];
}