From 19ead57cb2cf8fc530a580a3fa6ab35e731f1ef4 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 8 Sep 2006 17:00:45 +0000
Subject: [PATCH] Monotone-Parent: 162bfb7c82059f4e5043c0b54c30bbbb18428879
 Monotone-Revision: ae07a965b153ba60cbaf086866525dee4f7416ed

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-09-08T17:00:45
Monotone-Branch: ca.inverse.sogo
---
 UI/Scheduler/UIxCalSelectTab.m     | 2 +-
 UI/Scheduler/UIxCalView.m          | 4 ++--
 UI/Scheduler/UIxCalWeekPrintview.m | 4 ++--
 UI/Scheduler/UIxCalYearOverview.m  | 2 +-
 UI/Scheduler/UIxTimeDateControl.m  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/UI/Scheduler/UIxCalSelectTab.m b/UI/Scheduler/UIxCalSelectTab.m
index 2845fce43..32417e92b 100644
--- a/UI/Scheduler/UIxCalSelectTab.m
+++ b/UI/Scheduler/UIxCalSelectTab.m
@@ -52,7 +52,7 @@
 }
 
 - (void)setCurrentDate:(NSCalendarDate *)_date {
-    [_date setTimeZone:[self viewTimeZone]];
+    [_date setTimeZone:[[self clientObject] userTimeZone]];
     ASSIGN(self->currentDate, _date);
 }
 
diff --git a/UI/Scheduler/UIxCalView.m b/UI/Scheduler/UIxCalView.m
index a1faf58ed..e74d07b08 100644
--- a/UI/Scheduler/UIxCalView.m
+++ b/UI/Scheduler/UIxCalView.m
@@ -37,7 +37,7 @@ static BOOL shouldDisplayWeekend = NO;
     {
       NSTimeZone *tz;
 
-      tz = [self viewTimeZone];
+      tz = [[self clientObject] userTimeZone];
       self->aptFormatter
         = [[SOGoAptFormatter alloc] initWithDisplayTimeZone: tz];
       self->aptTooltipFormatter
@@ -295,7 +295,7 @@ static BOOL shouldDisplayWeekend = NO;
 
 - (void) setCurrentDay:(NSCalendarDate *) _day
 {
-  [_day setTimeZone: [self viewTimeZone]];
+  [_day setTimeZone: [[self clientObject] userTimeZone]];
   ASSIGN(self->currentDay, _day);
 }
 
diff --git a/UI/Scheduler/UIxCalWeekPrintview.m b/UI/Scheduler/UIxCalWeekPrintview.m
index f4af8e2e5..e1a3214b4 100644
--- a/UI/Scheduler/UIxCalWeekPrintview.m
+++ b/UI/Scheduler/UIxCalWeekPrintview.m
@@ -46,10 +46,10 @@
   canAccessApt = [self canAccessApt];
   spansRange   = NO;
   startDate    = [apt valueForKey:@"startDate"];
-  [startDate setTimeZone:[self viewTimeZone]];
+  [startDate setTimeZone:[[self clientObject] userTimeZone]];
   endDate      = [apt valueForKey:@"endDate"];
   if(endDate != nil) {
-    [endDate setTimeZone:[self viewTimeZone]];
+    [endDate setTimeZone:[[self clientObject] userTimeZone]];
     spansRange = ![endDate isEqualToDate:startDate];
   }
   aptDescr = [[NSMutableString alloc] init];
diff --git a/UI/Scheduler/UIxCalYearOverview.m b/UI/Scheduler/UIxCalYearOverview.m
index a87ca9594..f3e1d3558 100644
--- a/UI/Scheduler/UIxCalYearOverview.m
+++ b/UI/Scheduler/UIxCalYearOverview.m
@@ -98,7 +98,7 @@
 - (NSCalendarDate *)startDate {
   return [[[NSCalendarDate alloc] initWithYear:[self year] month:1 day:1
                                   hour:0 minute:0 second:0
-                                  timeZone:[self viewTimeZone]] autorelease];
+                                  timeZone:[[self clientObject] userTimeZone]] autorelease];
 }
 - (NSCalendarDate *)endDate {
   return nil;
diff --git a/UI/Scheduler/UIxTimeDateControl.m b/UI/Scheduler/UIxTimeDateControl.m
index 0a7173914..6cac3c0d3 100644
--- a/UI/Scheduler/UIxTimeDateControl.m
+++ b/UI/Scheduler/UIxTimeDateControl.m
@@ -253,7 +253,7 @@
                           hour:_hour
                           minute:_minute
                           second:_second
-                          timeZone:[self viewTimeZone]];
+                          timeZone: [[self clientObject] userTimeZone]];
       [self _setDate:d];
     }
 }