amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-06-24 03:14:17 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 7b6ad79fde0791f201e8b98eb957ded1410de5c1

Browse Source 
Monotone-Revision: 7576485920bab942eaccc45f2ab5b1914255643d

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-04-20T21:30:17
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-04-20 21:30:17 +00:00
parent 769979d8d5
commit b7067eec65
25 changed files with 68 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoUserDefaults.m
+5 -6
View File
@@ -49,7 +49,7 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
{
SOGoUserProfile *up;
SOGoUserDefaults *ud;
SOGoDefaultsSource *parentSource;
SOGoDefaultsSource *parent;
static Class SOGoUserProfileKlass = Nil;
if (!SOGoUserProfileKlass)
@@ -82,12 +82,11 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
// [self invalidateLanguage];
// }
parentSource = [SOGoDomainDefaults defaultsForDomain: domainId];
if (!parentSource)
parentSource = [SOGoSystemDefaults sharedSystemDefaults];
parent = [SOGoDomainDefaults defaultsForDomain: domainId];
if (!parent)
parent = [SOGoSystemDefaults sharedSystemDefaults];
ud = [self defaultsSourceWithSource: up
andParentSource: parentSource];
ud = [self defaultsSourceWithSource: up andParentSource: parent];
return ud;
}