Monotone-Parent: 9284db2af3ffef975cdd8b2d8850440185181e83
Monotone-Revision: f643d3c57f70e9da6cd4bbc6b07967927a9a0d53 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-09-06T20:53:42 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
b64e76afc6
commit
fcc4334f76
|
@ -5,6 +5,7 @@
|
|||
url string of non-ascii folder names.
|
||||
(+createRootSecondaryFolderWithFID:andName:forUser:): same as
|
||||
above.
|
||||
(+*): reverted all of the above.
|
||||
|
||||
* OpenChange/MAPIStoreMailVolatileMessage.m
|
||||
(FillMessageHeadersFromProperties): build a recipient list for the
|
||||
|
|
|
@ -129,8 +129,7 @@ MakeDisplayFolderName (NSString *folderName)
|
|||
for (count = 0; count < 3; count++)
|
||||
{
|
||||
context = talloc_zero (memCtx, struct mapistore_contexts_list);
|
||||
stringData = [NSString stringWithFormat: @"%@%@", urlBase,
|
||||
[folderName[count] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
|
||||
stringData = [NSString stringWithFormat: @"%@%@", urlBase, folderName[count]];
|
||||
context->url = [stringData asUnicodeInMemCtx: context];
|
||||
/* remove "folder" prefix */
|
||||
stringData = MakeDisplayFolderName (folderName[count]);
|
||||
|
@ -153,8 +152,7 @@ MakeDisplayFolderName (NSString *folderName)
|
|||
{
|
||||
context = talloc_zero (memCtx, struct mapistore_contexts_list);
|
||||
currentName = [secondaryFolders objectAtIndex: count];
|
||||
stringData = [NSString stringWithFormat: @"%@%@",
|
||||
urlBase, [currentName stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
|
||||
stringData = [NSString stringWithFormat: @"%@%@", urlBase, currentName];
|
||||
context->url = [stringData asUnicodeInMemCtx: context];
|
||||
stringData = [[currentName substringFromIndex: 6] fromCSSIdentifier];
|
||||
context->name = [stringData asUnicodeInMemCtx: context];
|
||||
|
@ -187,8 +185,7 @@ MakeDisplayFolderName (NSString *folderName)
|
|||
inContainer: accountFolder];
|
||||
if ([newFolder create])
|
||||
mapistoreURI = [NSString stringWithFormat: @"sogo://%@:%@@mail/%@/",
|
||||
userName, userName,
|
||||
[folderName stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
|
||||
userName, userName, folderName];
|
||||
else
|
||||
mapistoreURI = nil;
|
||||
[MAPIApp setUserContext: nil];
|
||||
|
|
Loading…
Reference in New Issue