From 2adcb276b2f09ada9c427de36d4625c84dabdefb Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 30 Mar 2012 15:33:47 +0000
Subject: [PATCH] Monotone-Parent: 4899b773e21bd6c56bae726bf720e184b8ef9ec0
 Monotone-Revision: cb7b77723f765942d950c5620150b720f5d0c5b1

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-03-30T15:33:47
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                             |  8 ++++++++
 OpenChange/MAPIStoreCalendarMessage.m |  4 ++--
 OpenChange/MAPIStoreContext.h         |  4 ++--
 OpenChange/MAPIStoreMailMessage.m     |  2 +-
 OpenChange/MAPIStoreObject.h          |  2 --
 OpenChange/MAPIStoreObject.m          | 15 ---------------
 OpenChange/MAPIStoreUserContext.h     |  4 ++++
 OpenChange/MAPIStoreUserContext.m     | 14 ++++++++++++++
 8 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 646dab57b..8859b3097 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-03-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIStoreUserContext.m (-timeZone): new method that
+	returns the timezone of an owner user.
+
+	* OpenChange/MAPIStoreObject.m (-ownerTimeZone): removed method,
+	replaced with the one above.
+
 2012-03-29  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/UIxPreferences.js (savePreferences): fixed
diff --git a/OpenChange/MAPIStoreCalendarMessage.m b/OpenChange/MAPIStoreCalendarMessage.m
index 004a30afc..6890fe172 100644
--- a/OpenChange/MAPIStoreCalendarMessage.m
+++ b/OpenChange/MAPIStoreCalendarMessage.m
@@ -118,7 +118,7 @@
               [MAPIStoreAppointmentWrapper wrapperWithICalEvent: event
                                                         andUser: [userContext sogoUser]
                                                  andSenderEmail: nil
-                                                     inTimeZone: [self ownerTimeZone]
+                                                     inTimeZone: [userContext timeZone]
                                              withConnectionInfo: [context connectionInfo]]);
     }
 
@@ -766,7 +766,7 @@
     isAllDay = [value boolValue];
   if (!isAllDay)
     {
-      tzName = [[self ownerTimeZone] name];
+      tzName = [[[self userContext] timeZone] name];
       tz = [iCalTimeZone timeZoneForName: tzName];
       [vCalendar addTimeZone: tz];
     }
diff --git a/OpenChange/MAPIStoreContext.h b/OpenChange/MAPIStoreContext.h
index ef3be71a6..fdea9bbd1 100644
--- a/OpenChange/MAPIStoreContext.h
+++ b/OpenChange/MAPIStoreContext.h
@@ -55,8 +55,8 @@
 {
   struct mapistore_connection_info *connInfo;
   NSMutableArray *containersBag;
-  SOGoUser *activeUser;
-  MAPIStoreUserContext *userContext;
+  SOGoUser *activeUser;              /* the user accessing the resource */
+  MAPIStoreUserContext *userContext; /* the owner or the resource */
   NSURL *contextUrl;
 }
 
diff --git a/OpenChange/MAPIStoreMailMessage.m b/OpenChange/MAPIStoreMailMessage.m
index aa0469774..005cade2f 100644
--- a/OpenChange/MAPIStoreMailMessage.m
+++ b/OpenChange/MAPIStoreMailMessage.m
@@ -284,7 +284,7 @@ _compareBodyKeysByPriority (id entry1, id entry2, void *data)
                                  wrapperWithICalEvent: event
                                               andUser: [context activeUser]
                                        andSenderEmail: senderEmail
-                                           inTimeZone: [self ownerTimeZone]
+                                           inTimeZone: [[self userContext] timeZone]
                                    withConnectionInfo: [context connectionInfo]];
           [appointmentWrapper retain];
         }
diff --git a/OpenChange/MAPIStoreObject.h b/OpenChange/MAPIStoreObject.h
index 773e806ac..cb7ed7809 100644
--- a/OpenChange/MAPIStoreObject.h
+++ b/OpenChange/MAPIStoreObject.h
@@ -77,8 +77,6 @@
 - (uint64_t) objectId;
 - (NSString *) url;
 
-- (NSTimeZone *) ownerTimeZone;
-
 /* properties */
 
 - (BOOL) canGetProperty: (enum MAPITAGS) propTag;
diff --git a/OpenChange/MAPIStoreObject.m b/OpenChange/MAPIStoreObject.m
index c0649c7a3..f2f8d0ebe 100644
--- a/OpenChange/MAPIStoreObject.m
+++ b/OpenChange/MAPIStoreObject.m
@@ -210,21 +210,6 @@ static Class NSExceptionK, MAPIStoreFolderK;
                     containerURL, [self nameInContainer]];
 }
 
-- (NSTimeZone *) ownerTimeZone
-{
-  NSString *owner;
-  SOGoUserDefaults *ud;
-  NSTimeZone *tz;
-  WOContext *woContext;
-
-  woContext = [[self userContext] woContext];
-  owner = [sogoObject ownerInContext: woContext];
-  ud = [[SOGoUser userWithLogin: owner] userDefaults];
-  tz = [ud timeZone];
-
-  return tz;
-}
-
 - (void) addProperties: (NSDictionary *) newNewProperties
 {
   [properties addEntriesFromDictionary: newNewProperties];
diff --git a/OpenChange/MAPIStoreUserContext.h b/OpenChange/MAPIStoreUserContext.h
index 43ae2e7ed..5cdd38710 100644
--- a/OpenChange/MAPIStoreUserContext.h
+++ b/OpenChange/MAPIStoreUserContext.h
@@ -27,6 +27,7 @@
 
 @class NSMutableDictionary;
 @class NSString;
+@class NSTimeZone;
 
 @class WOContext;
 
@@ -43,6 +44,7 @@
 {
   NSString *username;
   SOGoUser *sogoUser;
+  NSTimeZone *timeZone;
 
   SOGoUserFolder *userFolder;
   NSMutableArray *containersBag;
@@ -63,6 +65,8 @@
 - (NSString *) username;
 - (SOGoUser *) sogoUser;
 
+- (NSTimeZone *) timeZone;
+
 - (SOGoUserFolder *) userFolder;
 
 - (NSDictionary *) rootFolders;
diff --git a/OpenChange/MAPIStoreUserContext.m b/OpenChange/MAPIStoreUserContext.m
index 53f20d37c..dcb3cfb72 100644
--- a/OpenChange/MAPIStoreUserContext.m
+++ b/OpenChange/MAPIStoreUserContext.m
@@ -137,6 +137,20 @@ static NSMapTable *contextsTable = nil;
   return sogoUser;
 }
 
+- (NSTimeZone *) timeZone
+{
+  if (!timeZone)
+    {
+      SOGoUser *user;
+
+      user = [self sogoUser];
+      timeZone = [[user userDefaults] timeZone];
+      [timeZone retain];
+    }
+
+  return timeZone;
+}
+
 - (SOGoUserFolder *) userFolder
 {
   if (!userFolder)