mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-07-02 23:34:21 +00:00
Monotone-Parent: aada198309b5b9b1d7e6e2f2faade7b2b97c4718
Monotone-Revision: 04adb21a2d66943bc4fbda82a60f41695303ccfb Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-01-14T22:57:44 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
@@ -1,3 +1,8 @@
|
||||
2010-01-14 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* Tools/SOGoToolBackup.m (-extractUserPreferences:intoRecord:):
|
||||
fixed compilation warning.
|
||||
|
||||
2010-01-13 Francis Lachapelle <flachapelle@inverse.ca>
|
||||
|
||||
* UI/WebServerResources/ContactsUI.js (-fixSearchFieldPosition):
|
||||
|
||||
@@ -38,7 +38,9 @@
|
||||
#import <SOGo/NSArray+Utilities.h>
|
||||
#import <SOGo/NSDictionary+Utilities.h>
|
||||
#import <SOGo/SOGoUser.h>
|
||||
#import <SOGo/SOGoUserDefaults.h>
|
||||
#import <SOGo/SOGoUserProfile.h>
|
||||
#import <SOGo/SOGoUserSettings.h>
|
||||
|
||||
#import "SOGoToolBackup.h"
|
||||
|
||||
@@ -341,12 +343,13 @@
|
||||
{
|
||||
SOGoUser *sogoUser;
|
||||
NSArray *preferences;
|
||||
NSDictionary *defaultsValues, *settingsValues;
|
||||
SOGoUserProfile *defaultsSource, *profileSource;
|
||||
|
||||
sogoUser = [SOGoUser userWithLogin: uid roles: nil];
|
||||
defaultsValues = [[[sogoUser userDefaults] source] values];
|
||||
settingsValues = [[[sogoUser userSettings] source] values];
|
||||
preferences = [NSArray arrayWithObjects: defaultsValues, settingsValues,
|
||||
defaultsSource = [[sogoUser userDefaults] source];
|
||||
profileSource = [[sogoUser userSettings] source];
|
||||
preferences = [NSArray arrayWithObjects:
|
||||
[defaultsSource values], [profileSource values],
|
||||
nil];
|
||||
[userRecord setObject: preferences forKey: @"preferences"];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user