From af300fc0da9193df967a271998e6ac16a4aa6cad Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 8 Sep 2006 15:18:03 +0000
Subject: [PATCH] Monotone-Parent: dd85bf5964ed0c3db1f8a221c4b661e16160f8fa
 Monotone-Revision: 3b82be87d54654cef58e4b1e223610678824ba7a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-09-08T15:18:03
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                     |  3 +++
 .../Appointments/SOGoAppointmentFolder.h      |  6 ------
 .../Appointments/SOGoAppointmentFolder.m      | 20 ++++---------------
 3 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 876745853..87259d75e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-09-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Appointments/SOGoAppointmentFolder.[hm]: removed the
+	"timeZone" ivar and its accessors.
+
 	* SoObjects/SOGo/SOGoObject.m ([SOGoObject -serverTimeZone]): new
 	centralized method returing the timezone configured in the
 	userdefaults db or "Canada/Eastern" if missing.
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.h b/SoObjects/Appointments/SOGoAppointmentFolder.h
index 1af117732..853ef0dc1 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.h
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.h
@@ -41,12 +41,9 @@
 @class NSString, NSArray, NSCalendarDate, NSException, NSMutableDictionary;
 @class GCSFolder;
 
-@class NSTimeZone;
-
 @interface SOGoAppointmentFolder : SOGoFolder
 {
   NSMutableDictionary *uidToFilename;
-  NSTimeZone *timeZone;
 }
 
 /* selection */
@@ -99,9 +96,6 @@
 
 - (NSArray *)fetchAllSOGoAppointments;
 
-- (void) setTimeZone: (NSTimeZone *) newTZ;
-- (NSTimeZone *) viewTimeZone;
-
 @end
 
 #endif /* __Appointments_SOGoAppointmentFolder_H__ */
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 54cc4678e..a14177caf 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -69,18 +69,6 @@ static NSNumber   *sharedYes = nil;
   [super dealloc];
 }
 
-/* timezone */
-
-- (void) setTimeZone: (NSTimeZone *) newTZ
-{
-  timeZone = newTZ;
-}
-
-- (NSTimeZone *) viewTimeZone
-{
-  return timeZone;
-}
-
 /* logging */
 
 - (id) debugLogger
@@ -216,7 +204,7 @@ static NSNumber   *sharedYes = nil;
   if ((tmp = [_record objectForKey:@"startdate"])) {
     tmp = [[NSCalendarDate alloc] initWithTimeIntervalSince1970:
           (NSTimeInterval)[tmp unsignedIntValue]];
-    [tmp setTimeZone:[self viewTimeZone]];
+    [tmp setTimeZone: [self userTimeZone]];
     if (tmp) [md setObject:tmp forKey:@"startDate"];
     [tmp release];
   }
@@ -226,7 +214,7 @@ static NSNumber   *sharedYes = nil;
   if ((tmp = [_record objectForKey:@"enddate"])) {
     tmp = [[NSCalendarDate alloc] initWithTimeIntervalSince1970:
           (NSTimeInterval)[tmp unsignedIntValue]];
-    [tmp setTimeZone:[self viewTimeZone]];
+    [tmp setTimeZone: [self userTimeZone]];
     if (tmp) [md setObject:tmp forKey:@"endDate"];
     [tmp release];
   }
@@ -246,10 +234,10 @@ static NSNumber   *sharedYes = nil;
   
   /* cycle is in _r */
   tmp = [_r startDate];
-  [tmp setTimeZone:[self viewTimeZone]];
+  [tmp setTimeZone:[self userTimeZone]];
   [md setObject:tmp forKey:@"startDate"];
   tmp = [_r endDate];
-  [tmp setTimeZone:[self viewTimeZone]];
+  [tmp setTimeZone:[self userTimeZone]];
   [md setObject:tmp forKey:@"endDate"];
   
   return md;