Monotone-Parent: 7c8fce0426b2ec4def5226f16a9bcf2cff5dcfb9

Monotone-Revision: 1cc99cc487a5bfdb791d4067042b904d7eb47795

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-09-07T16:46:18
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2012-09-07 16:46:18 +00:00
parent 772c73ac13
commit fc62d76b1f
6 changed files with 55 additions and 31 deletions

View File

@@ -129,7 +129,8 @@ MakeDisplayFolderName (NSString *folderName)
for (count = 0; count < 3; count++)
{
context = talloc_zero (memCtx, struct mapistore_contexts_list);
stringData = [NSString stringWithFormat: @"%@%@", urlBase, folderName[count]];
stringData = [NSString stringWithFormat: @"%@%@", urlBase,
[folderName[count] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
context->url = [stringData asUnicodeInMemCtx: context];
/* remove "folder" prefix */
stringData = MakeDisplayFolderName (folderName[count]);
@@ -152,7 +153,8 @@ MakeDisplayFolderName (NSString *folderName)
{
context = talloc_zero (memCtx, struct mapistore_contexts_list);
currentName = [secondaryFolders objectAtIndex: count];
stringData = [NSString stringWithFormat: @"%@%@", urlBase, currentName];
stringData = [NSString stringWithFormat: @"%@%@",
urlBase, [currentName stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
context->url = [stringData asUnicodeInMemCtx: context];
stringData = [[currentName substringFromIndex: 6] fromCSSIdentifier];
context->name = [stringData asUnicodeInMemCtx: context];
@@ -185,7 +187,8 @@ MakeDisplayFolderName (NSString *folderName)
inContainer: accountFolder];
if ([newFolder create])
mapistoreURI = [NSString stringWithFormat: @"sogo://%@:%@@mail/%@/",
userName, userName, folderName];
userName, userName,
[folderName stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
else
mapistoreURI = nil;
[MAPIApp setUserContext: nil];