From 2f26b074aa0047d4cbc0c4e364a2dbb72dafd57d Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 8 Sep 2006 16:59:03 +0000 Subject: [PATCH] Monotone-Parent: 11f8d83d73adbe0533367093aedd11247bf76b6d Monotone-Revision: 0be38e52c20f800a65befd7b4eeca913e9d0d505 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-09-08T16:59:03 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ SoObjects/SOGo/SOGoObject.m | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f348ce12..7e1d24b41 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-09-08 Wolfgang Sourdeau + * SoObjects/SOGo/SOGoObject.m ([SOGoObject -userTimeZone]): retain + the timezone even when it's the server timezone. + * SoObjects/SOGo/SOGoUserFolder.m ([SOGoUserFolder -privateContacts:inContext:]): no long configure the calendar object with the user's timezone since it's now accessible diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m index 1cde0f91d..ca9169e58 100644 --- a/SoObjects/SOGo/SOGoObject.m +++ b/SoObjects/SOGo/SOGoObject.m @@ -402,10 +402,9 @@ static NSTimeZone *serverTimeZone = nil; userPrefs = [[context activeUser] userDefaults]; userTimeZone = [NSTimeZone timeZoneWithName: [userPrefs stringForKey: @"timezonename"]]; - if (userTimeZone) - [userTimeZone retain]; - else + if (!userTimeZone) userTimeZone = [self serverTimeZone]; + [userTimeZone retain]; } return userTimeZone;