From 6d83d9a512c676f4017c7d105b95767ebd29f9c6 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 8 Sep 2006 15:19:03 +0000 Subject: [PATCH] Monotone-Parent: 3b82be87d54654cef58e4b1e223610678824ba7a Monotone-Revision: 1d2a69e6efdbc8e2b7a0ef180ed911def1159150 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-09-08T15:19:03 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/Appointments/SOGoAppointmentObject.m | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 87259d75e..6804e104c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-09-08 Wolfgang Sourdeau + * SoObjects/Appointments/SOGoAppointmentObject.m: + ([SOGoAppointmentObject -viewTimeZoneForPerson:_person]): returns + [self serverTimeZone] instead of "EST" (which was removed). + * SoObjects/Appointments/SOGoAppointmentFolder.[hm]: removed the "timeZone" ivar and its accessors. diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m index dec6c8da8..d9e1804a3 100644 --- a/SoObjects/Appointments/SOGoAppointmentObject.m +++ b/SoObjects/Appointments/SOGoAppointmentObject.m @@ -59,7 +59,6 @@ static id parser = nil; static SaxObjectDecoder *sax = nil; static NGLogger *logger = nil; -static NSTimeZone *EST = nil; static NSString *mailTemplateDefaultLanguage = nil; + (void)initialize { @@ -86,8 +85,6 @@ static NSString *mailTemplateDefaultLanguage = nil; [parser setContentHandler:sax]; [parser setErrorHandler:sax]; - EST = [[NSTimeZone timeZoneWithAbbreviation:@"EST"] retain]; - ud = [NSUserDefaults standardUserDefaults]; mailTemplateDefaultLanguage = [[ud stringForKey:@"SOGoDefaultLanguage"] retain]; @@ -574,11 +571,12 @@ static NSString *mailTemplateDefaultLanguage = nil; return [NSString stringWithFormat:@"%@%@", baseURL, uid]; } -- (NSTimeZone *)viewTimeZoneForPerson:(iCalPerson *)_person { +- (NSTimeZone *) viewTimeZoneForPerson: (iCalPerson *) _person +{ /* TODO: get this from user config as soon as this is available and only * fall back to default timeZone if config data is not available */ - return EST; + return [self serverTimeZone]; }