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

Monotone-Parent: a1668784bf0e7d4c0f6537e4fd960651c40e912b

Browse Source 
Monotone-Revision: 4820885b1e556f6d0177021967d8b07cb1154aff

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-02-23T23:34:26
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2012-02-23 23:34:26 +00:00
parent c497b03aa5
commit 0056906629
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,5 +1,9 @@
2012-02-23 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreMailContext.m
(+listContextsForUser:withTDBIndexing:inMemCtx:): added back
"trashName".
* SoObjects/Appointments/SOGoCalendarComponent.m
(-sendEMailUsingTemplateNamed:forObject:previousObject:toAttendees:withType:):
added a "msgType" parameter that is added as value to the new

9
OpenChange/MAPIStoreMailContext.m
View File

@@ -84,7 +84,7 @@ MakeDisplayFolderName (NSString *folderName)
inMemCtx: (TALLOC_CTX *) memCtx
{
struct mapistore_contexts_list *firstContext = NULL, *context;
NSString *urlBase, *stringData, *currentName, *inboxName, *draftsName, *sentName;
NSString *urlBase, *stringData, *currentName, *inboxName, *draftsName, *sentName, *trashName;
NSArray *unprefixedFolders;
NSMutableArray *secondaryFolders;
enum mapistore_context_role role[] = {MAPISTORE_MAIL_ROLE,
@@ -116,6 +116,13 @@ MakeDisplayFolderName (NSString *folderName)
[unprefixedFolders componentsJoinedByString: @"/folder"]];
folderName[2] = sentName;
/* Note: trash is not used as a mail folder, since "Deleted Items" makes use of
the fallback context */
unprefixedFolders = [[accountFolder trashFolderNameInContext: woContext]
componentsSeparatedByString: @"/"];
trashName = [NSString stringWithFormat: @"folder%@",
[unprefixedFolders componentsJoinedByString: @"/folder"]];
urlBase = [NSString stringWithFormat: @"sogo://%@:%@@mail/", userName, userName];
for (count = 0; count < 3; count++)
{