Monotone-Parent: 3a9c8a7bada864ce6b83c04661c09d59c8ecf8d9

Monotone-Revision: 31ddf1e225a45a18cc6693f45745d82251abfd64

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-02-23T21:14:02
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2012-02-23 21:14:02 +00:00
parent 89a3944c8b
commit 43a02620a6
2 changed files with 11 additions and 2 deletions

View File

@ -1,5 +1,10 @@
2012-02-23 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreContext.m
(+createRootFolder:withFID:andName:forUser:withRole:): when the
creation of a folder fails in the proper contact, fallback on the
fallback context.
* SoObjects/Mailer/SOGoMailAccount.m
(-toManyRelationshipKeysWithNamespaces:): for some reason, we were
explicitly returning the drafts folder name in the batch whether

View File

@ -185,12 +185,16 @@ MAPIStoreLookupContextClassByRole (Class self, enum mapistore_context_role role)
contextClass = MAPIStoreFallbackContextK;
mapistoreURI = [contextClass createRootSecondaryFolderWithFID: fid
andName: (NSString *) folderName
andName: folderName
forUser: userName];
if (!mapistoreURI && contextClass != MAPIStoreFallbackContextK)
mapistoreURI = [MAPIStoreFallbackContextK createRootSecondaryFolderWithFID: fid
andName: folderName
forUser: userName];
if (mapistoreURI)
*mapistoreUriP = mapistoreURI;
else
rc = MAPISTORE_ERROR;
rc = MAPISTORE_ERR_NOT_FOUND;
return rc;
}