From a8cc7409a11225d466b19eb359bc8571798b5e66 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 16 Mar 2012 20:57:35 +0000 Subject: [PATCH] Monotone-Parent: 284725383e8970e66810d4b8facf4af043b77fe2 Monotone-Revision: 34a0500cef031e53eda3a1a6c3b2f626ce8f76dc Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-03-16T20:57:35 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 8 ++++++++ OpenChange/MAPIStoreGCSBaseContext.m | 3 +++ OpenChange/MAPIStoreMailContext.m | 3 +++ 3 files changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index 94ed06ca5..862cd95fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2012-03-16 Wolfgang Sourdeau + * OpenChange/MAPIStoreGCSBaseContext.m + (+createRootSecondaryFolderWithFID:andName:forUser:): setup the + userContext in the MAPIApp object. + + * OpenChange/MAPIStoreMailContext.m + (+createRootSecondaryFolderWithFID:andName:forUser:): setup the + userContext in the MAPIApp object. + * OpenChange/MAPIStoreContactsFolder.m (-getPidTagDefaultPostMessageClass:inMemCtx:): new getter. diff --git a/OpenChange/MAPIStoreGCSBaseContext.m b/OpenChange/MAPIStoreGCSBaseContext.m index d13e6bc58..296479251 100644 --- a/OpenChange/MAPIStoreGCSBaseContext.m +++ b/OpenChange/MAPIStoreGCSBaseContext.m @@ -27,6 +27,7 @@ #import #import +#import "MAPIApplication.h" #import "MAPIStoreUserContext.h" #import "NSString+MAPIStore.h" @@ -118,6 +119,7 @@ userContext = [MAPIStoreUserContext userContextWithUsername: userName andTDBIndexing: NULL]; + [MAPIApp setUserContext: userContext]; moduleName = [self MAPIModuleName]; parentFolder = [[userContext rootFolders] objectForKey: moduleName]; if (![parentFolder newFolderWithName: folderName @@ -126,6 +128,7 @@ userName, moduleName, nameInContainer]; else mapistoreURI = nil; + [MAPIApp setUserContext: nil]; return mapistoreURI; } diff --git a/OpenChange/MAPIStoreMailContext.m b/OpenChange/MAPIStoreMailContext.m index f42f331c9..d91d76514 100644 --- a/OpenChange/MAPIStoreMailContext.m +++ b/OpenChange/MAPIStoreMailContext.m @@ -32,6 +32,7 @@ #import "NSString+MAPIStore.h" #import +#import "MAPIApplication.h" #import "MAPIStoreMailContext.h" #include @@ -176,6 +177,7 @@ MakeDisplayFolderName (NSString *folderName) userContext = [MAPIStoreUserContext userContextWithUsername: userName andTDBIndexing: NULL]; + [MAPIApp setUserContext: userContext]; accountFolder = [[userContext rootFolders] objectForKey: @"mail"]; folderName = [NSString stringWithFormat: @"folder%@", [newFolderName asCSSIdentifier]]; @@ -186,6 +188,7 @@ MakeDisplayFolderName (NSString *folderName) userName, userName, folderName]; else mapistoreURI = nil; + [MAPIApp setUserContext: nil]; return mapistoreURI; }