Monotone-Parent: 94cd3c2d69b764a47aa3032dde40735f50a696c9

Monotone-Revision: e37818ac299ffd1845d90c7047747a1432c95bcf

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-01-06T19:43:23
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,5 +1,10 @@
 2010-01-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Scheduler/UIxCalMainView.m (-_setupContext): only invoked once
+	per instance.
+	(-checkDefaultModulePreference): synchronize the user defaults
+	after the login module was modified.
+
 	* UI/Scheduler/UIxDatePicker.m
 	(-takeValuesFromRequest:inContext:): we set the new date to the
 	user's timezone and recompute the proper offset compare to the

UI/Scheduler/UIxCalMainView.h

@@ -35,6 +35,7 @@
   NSNumber *yearMenuItem;
   SOGoUserSettings *us;
   NSMutableDictionary *moduleSettings;
+  BOOL contextIsSetup;
 }
 
 - (NSArray *) monthMenuItems;

UI/Scheduler/UIxCalMainView.m

@@ -49,7 +49,10 @@
 
   ud = [[context activeUser] userDefaults];
   if ([ud rememberLastModule])
+    {
       [ud setLoginModule: @"Calendar"];
+      [ud synchronize];
+    }
 }
 
 - (void) _setupContext
@@ -58,6 +61,7 @@
   NSString *module;
   SOGoAppointmentFolders *clientObject;
 
+  contextIsSetup = YES;
   [self checkDefaultModulePreference];
 
   activeUser = [context activeUser];
@@ -135,6 +139,7 @@
 {
   NSString *vertical;
   
+  if (!contextIsSetup)
     [self _setupContext];
   vertical = [moduleSettings objectForKey: @"DragHandleVertical"];
 
@@ -145,6 +150,7 @@
 {
   NSString *horizontal;
 
+  if (!contextIsSetup)
     [self _setupContext];
   horizontal = [moduleSettings objectForKey: @"DragHandleHorizontal"];
 
@@ -155,6 +161,7 @@
 {
   NSString *height;
 
+  if (!contextIsSetup)
     [self _setupContext];
   height = [moduleSettings objectForKey: @"DragHandleVertical"];
 
@@ -166,6 +173,7 @@
   WORequest *request;
   NSString *dragHandle;
   
+  if (!contextIsSetup)
     [self _setupContext];
   request = [context request];
 
@@ -205,6 +213,7 @@
 {
   NSString *view;
   
+  if (!contextIsSetup)
     [self _setupContext];
   view = [moduleSettings objectForKey: @"View"];