Monotone-Parent: 4e23e038f2b0b7eddf8b30700b8c9a8910768f98

Monotone-Revision: 9235e5dc4d151a3cba8ad842ac39e1b2d18c8201

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-29T19:55:21
Monotone-Branch: ca.inverse.sogo

OpenChange/MAPIStoreObject.m

@@ -30,6 +30,7 @@
 #import "MAPIStoreFolder.h"
 #import "MAPIStorePropertySelectors.h"
 #import "MAPIStoreTypes.h"
+#import "MAPIStoreUserContext.h"
 #import "NSDate+MAPIStore.h"
 #import "NSData+MAPIStore.h"
 #import "NSObject+MAPIStore.h"
@@ -170,11 +171,21 @@ static Class NSExceptionK, MAPIStoreFolderK;
   return [sogoObject nameInContainer];
 }
 
-- (id) context
+- (MAPIStoreContext *) context
 {
   return [container context];
 }
 
+- (MAPIStoreUserContext *) userContext
+{
+  return [[self context] userContext];
+}
+
+- (MAPIStoreMapping *) mapping
+{
+  return [[self userContext] mapping];
+}
+
 - (void) cleanupCaches
 {
 }
@@ -217,7 +228,7 @@ static Class NSExceptionK, MAPIStoreFolderK;
   NSTimeZone *tz;
   WOContext *woContext;
 
-  woContext = [[self context] woContext];
+  woContext = [[self userContext] woContext];
   owner = [sogoObject ownerInContext: woContext];
   ud = [[SOGoUser userWithLogin: owner] userDefaults];
   tz = [ud timeZone];