Monotone-Parent: a74b906d58327f02724a366df126c83b4bdcc4c9

Monotone-Revision: efd9ade13655768d4cae7605de1142d71a2b3e0c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-09-02T02:52:55
Monotone-Branch: ca.inverse.sogo

SoObjects/SOGo/SOGoUser.m

@@ -201,7 +201,7 @@ _timeValue (NSString *key)
       if (user)
 	{
 	  [user autorelease];
-	  [cache registerUser: user];
+ 	  [cache registerUser: user];
 	}
     }
   [user setPrimaryRoles: newRoles];
@@ -209,25 +209,6 @@ _timeValue (NSString *key)
   return user;
 }
 
-- (id) init
-{
-  if ((self = [super init]))
-    {
-      userDefaults = nil;
-      userSettings = nil;
-      allEmails = nil;
-      language = nil;
-      currentPassword = nil;
-      dateFormatter = nil;
-      homeFolder = nil;
-      cn = nil;
-      userTimeZone = nil;
-      mailAccounts = nil;
-    }
-
-  return self;
-}
-
 - (id) initWithLogin: (NSString *) newLogin
 	       roles: (NSArray *) newRoles
 {
@@ -247,7 +228,21 @@ _timeValue (NSString *key)
     }
 
   if ([realUID length])
-    self = [super initWithLogin: realUID roles: newRoles];
+    {
+      if ((self = [super initWithLogin: realUID roles: newRoles]))
+	{
+	  userDefaults = nil;
+	  userSettings = nil;
+	  allEmails = nil;
+	  language = nil;
+	  currentPassword = nil;
+	  dateFormatter = nil;
+	  homeFolder = nil;
+	  cn = nil;
+	  userTimeZone = nil;
+	  mailAccounts = nil;
+	}
+    }
   else
     {
       [self release];