Monotone-Parent: 1fb3121c84e0bb2773973fcfde109c7b26530951

Monotone-Revision: e2f910a1982b774a3f5dfd586d968821441f2076

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-08-17T17:56:25
Monotone-Branch: ca.inverse.sogo

OpenChange/MAPIStoreContext.m

@@ -366,7 +366,8 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
   NSString *objectURL, *url;
   // TDB_DATA key, dbuf;
 
-  url = [contextUrl absoluteString];
+  url = [[contextUrl absoluteString]
+            stringByReplacingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
   objectURL = [[userContext mapping] urlFromID: fmid];
   if (objectURL)
     {
@@ -417,15 +418,18 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
   MAPIStoreFolder *baseFolder;
   SOGoFolder *currentFolder;
   WOContext *woContext;
-  NSString *path;
+  NSString *path, *urlString;
   NSArray *pathComponents;
   NSUInteger count, max;
 
   mapping = [userContext mapping];
   if (![mapping urlFromID: newFid])
-    [mapping registerURL: [contextUrl absoluteString]
-                  withID: newFid];
-
+    {
+      urlString = [[contextUrl absoluteString]
+                      stringByReplacingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
+      [mapping registerURL: urlString
+                    withID: newFid];
+    }
   [userContext activateWithUser: activeUser];
   woContext = [userContext woContext];