Monotone-Parent: 2fdf0ead0781ef2362dd389811d5db44ca4cc84a

Monotone-Revision: c91eef7edcfd08d414664c25a590b6268a7e58e2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-11-29T04:19:32
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-11-29 04:19:32 +00:00
parent 3821d1aa7f
commit b79a7e5a00
129 changed files with 4402 additions and 3316 deletions
+2 -2
View File
@@ -37,7 +37,7 @@
#import <SOGo/NSArray+Utilities.h>
#import <SOGo/NSDictionary+Utilities.h>
#import <SOGo/SOGoUser.h>
#import <SOGo/SOGoUserDefaults.h>
#import <SOGo/SOGoUserProfile.h>
#import "SOGoToolBackup.h"
@@ -301,7 +301,7 @@
{
NSEnumerator *ldapSources;
NSString *sourceID;
LDAPSource *currentSource;
NSObject <SOGoSource> *currentSource;
SOGoUserManager *lm;
NSDictionary *userEntry;
BOOL done;
+8 -8
View File
@@ -36,7 +36,7 @@
#import <SOGo/SOGoUserManager.h>
#import <SOGo/NSArray+Utilities.h>
#import <SOGo/SOGoUser.h>
#import <SOGo/SOGoUserDefaults.h>
#import <SOGo/SOGoUserProfile.h>
#import "SOGoToolRestore.h"
@@ -527,7 +527,7 @@
- (BOOL) restoreUserPreferencesFromUserRecord: (NSDictionary *) userRecord
{
SOGoUser *sogoUser;
NSUserDefaults *storedPreferences;
SOGoUserProfile *up;
NSArray *preferences;
BOOL rc;
@@ -537,13 +537,13 @@
rc = YES;
sogoUser = [SOGoUser userWithLogin: userID roles: nil];
storedPreferences = [sogoUser userDefaults];
[storedPreferences setValues: [preferences objectAtIndex: 0]];
[storedPreferences synchronize];
up = [[sogoUser userDefaults] source];
[up setValues: [preferences objectAtIndex: 0]];
[up synchronize];
storedPreferences = [sogoUser userSettings];
[storedPreferences setValues: [preferences objectAtIndex: 1]];
[storedPreferences synchronize];
up = [[sogoUser userSettings] source];
[up setValues: [preferences objectAtIndex: 1]];
[up synchronize];
}
else
{