git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1118 d1b88da0-ebda-0310...

diff --git a/UI/MainUI/SOGoUserHomePage.m b/UI/MainUI/SOGoUserHomePage.m
index 678698256621a4e41db91a4ac09205a63e2fd942..f64869933f8b3b01a2a1f92d0364f693672d8c8d 100644 (file)
--- a/UI/MainUI/SOGoUserHomePage.m
+++ b/UI/MainUI/SOGoUserHomePage.m
@@ -36,7 +36,7 @@
 #import <SOGo/NSCalendarDate+SOGo.h>
 #import <SOGoUI/UIxComponent.h>
 
-static NSString *defaultModule;
+static NSString *defaultModule = nil;
 
 @interface SOGoUserHomePage : UIxComponent
 
@@ -48,10 +48,10 @@ static NSString *defaultModule;
 {
   NSUserDefaults *ud;
 
-  ud = [NSUserDefaults standardUserDefaults];
-  defaultModule = [ud stringForKey: @"SOGoUIxDefaultModule"];
-  if (defaultModule)
+  if (!defaultModule)
     {
+      ud = [NSUserDefaults standardUserDefaults];
+      defaultModule = [ud stringForKey: @"SOGoUIxDefaultModule"];
       if (defaultModule)
        {
          if (!([defaultModule isEqualToString: @"Calendar"]
@@ -62,10 +62,11 @@ static NSString *defaultModule;
                    @"'Calendar', 'Contacts' or Mail)", defaultModule];
              defaultModule = @"Calendar";
            }
+         else
+           defaultModule = @"Calendar";
        }
       else
        defaultModule = @"Calendar";
-
       [self logWithFormat: @"default module set to '%@'", defaultModule];
       [defaultModule retain];
     }

diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 5799e82dcdfec4e4b845b0f132ea3e39052a0d9a..4fb12e88d5e0c23e133dc31c996cbf10ead159b2 100644 (file)
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -40,6 +40,7 @@
    workweek = from -> to
    identities */
 
+static BOOL defaultsRead = NO;
 static BOOL shouldDisplayPasswordChange = NO;
 
 @implementation UIxPreferences
@@ -48,9 +49,13 @@ static BOOL shouldDisplayPasswordChange = NO;
 {
   NSUserDefaults *ud;
 
-  ud = [NSUserDefaults standardUserDefaults];
-  shouldDisplayPasswordChange
-    = [ud boolForKey: @"SOGoUIxUserCanChangePassword"];
+  if (!defaultsRead)
+    {
+      ud = [NSUserDefaults standardUserDefaults];
+      shouldDisplayPasswordChange
+       = [ud boolForKey: @"SOGoUIxUserCanChangePassword"];
+      defaultsRead = YES;
+    }
 }
 
 - (id) init