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

propagate from branch 'ca.inverse.sogo.1_3_15' (head 7d1f68d661b9fcfd676be1e6d3d6ce6c1fb09df9)

Browse Source 
to branch 'ca.inverse.sogo' (head 1a746e7d8ab981f6bbfb22f428fe19cc085bd285)

Monotone-Parent: 1a746e7d8ab981f6bbfb22f428fe19cc085bd285
Monotone-Parent: 7d1f68d661b9fcfd676be1e6d3d6ce6c1fb09df9
Monotone-Revision: 388fbe7a186b5078c0f26161280ef319963b910d

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-04-30T17:19:23
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2012-04-30 17:19:23 +00:00
parent 26240ad737 c290e70342
commit e054f972a2
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+6
View File
@@ -10,6 +10,12 @@
(-davCalendarUserAddressSet): Modified to honor
SOGoHideSystemEMail domain default.
* SoObjects/Mailer/SOGoDraftObject.m (-lookupName:...):
We prioritize the lookup of the "Drafts" folder over the
"Sent" one if both are matching.
* SoObjects/Mailer/SOGoMailFolder.m: Same as above.
2012-04-25 Jean Raby <jraby@inverse.ca>
SoObjects/Mailer/SOGoMailAccount.m
+3 -3
View File
@@ -546,12 +546,12 @@ static NSString *inboxFolderName = @"INBOX";
[self _appendNamespaces: namespaces];
if ([namespaces containsObject: folderName])
klazz = [SOGoMailNamespace class];
else if ([folderName
isEqualToString: [self sentFolderNameInContext: _ctx]])
klazz = [SOGoSentFolder class];
else if ([folderName
isEqualToString: [self draftsFolderNameInContext: _ctx]])
klazz = [SOGoDraftsFolder class];
else if ([folderName
isEqualToString: [self sentFolderNameInContext: _ctx]])
klazz = [SOGoSentFolder class];
else if ([folderName
isEqualToString: [self trashFolderNameInContext: _ctx]])
klazz = [SOGoTrashFolder class];
SoObjects/Mailer/SOGoMailFolder.m
+4 -4
View File
@@ -870,13 +870,13 @@ static NSString *defaultUserID = @"anyone";
fullFolderName = [NSString stringWithFormat: @"%@/%@",
[self traversalFromMailAccount], folderName];
if ([fullFolderName
isEqualToString:
[mailAccount sentFolderNameInContext: _ctx]])
className = @"SOGoSentFolder";
else if ([fullFolderName
isEqualToString:
[mailAccount draftsFolderNameInContext: _ctx]])
className = @"SOGoDraftsFolder";
else if ([fullFolderName
isEqualToString:
[mailAccount sentFolderNameInContext: _ctx]])
className = @"SOGoSentFolder";
else if ([fullFolderName
isEqualToString:
[mailAccount trashFolderNameInContext: _ctx]])