Monotone-Parent: c33c456b52c6e6d4ee1f29bfd9ca57096b8d13be

Monotone-Revision: 5539e3c473023281dd04f7cb8a8fee051ac0735d

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-04-11T19:08:58
Monotone-Branch: ca.inverse.sogo

UI/Scheduler/UIxAppointmentEditor.m

@@ -249,13 +249,15 @@
 - (NSCalendarDate *) newStartDate
 {
   NSCalendarDate *newStartDate, *now;
+  NSTimeZone *timeZone;
   int hour;
 
   newStartDate = [self selectedDate];
   if ([[self queryParameterForKey: @"hm"] length] == 0)
     {
       now = [NSCalendarDate calendarDate];
-      [now setTimeZone: [[self clientObject] userTimeZone]];
+      timeZone = [[context activeUser] timeZone];
+      [now setTimeZone: timeZone];
       if ([now isDateOnSameDay: newStartDate])
         {
           hour = [now hourOfDay];
@@ -365,23 +367,23 @@
 
 // TODO: add tentatively
 
-- (id) acceptOrDeclineAction: (BOOL) _accept
+- (id) acceptOrDeclineAction: (BOOL) accept
 {
-  [[self clientObject] changeParticipationStatus:
-                         _accept ? @"ACCEPTED" : @"DECLINED"
-                       inContext: [self context]];
+  [[self clientObject] changeParticipationStatus: (accept
+						   ? @"ACCEPTED"
+						   : @"DECLINED")];
 
   return self;
 }
 
 - (id) acceptAction
 {
-  return [self acceptOrDeclineAction:YES];
+  return [self acceptOrDeclineAction: YES];
 }
 
 - (id) declineAction
 {
-  return [self acceptOrDeclineAction:NO];
+  return [self acceptOrDeclineAction: NO];
 }
 
 @end