amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-11 16:28:51 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: b8dd0da637c01e983924030f920c45d1581a5e95

Browse Source 
Monotone-Revision: f845aee937de02ccc5aaec9e4f9592ddeea27abf

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-03-20T19:42:44
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-03-20 19:42:44 +00:00
parent 818de74e5e
commit c40475ab77
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -4,6 +4,9 @@
values are not nil before putting them in the cache. This fixes an
exception occuring for setting a nil key in a dictionary.
([SOGoUser -userSettings]): same as above.
([SOGoUser -userDefaults]): if "value" is null, meaning that
database connectivity has failed, don't try to set default values,
which would trigger other connection tries.
2009-03-19 Francis Lachapelle <flachapelle@inverse.ca>

26
SoObjects/SOGo/SOGoUser.m
View File

@@ -461,22 +461,22 @@ _timeValue (NSString *key)
defaults = [self primaryUserDefaults];
if (defaults)
{
// Required parameters for the Web interface
if (![[defaults stringForKey: @"ReplyPlacement"] length])
[defaults setObject: defaultReplyPlacement forKey: @"ReplyPlacement"];
if (![[defaults stringForKey: @"SignaturePlacement"] length])
[defaults setObject: defaultSignaturePlacement forKey: @"SignaturePlacement"];
if (![[defaults stringForKey: @"MessageForwarding"] length])
[defaults setObject: defaultMessageForwarding forKey: @"MessageForwarding"];
if (![[defaults stringForKey: @"MessageCheck"] length])
[defaults setObject: defaultMessageCheck forKey: @"MessageCheck"];
// We propagate the loaded user defaults to other sogod instances
// which will cache them in SOGoCache (including for the instance
// that actually posts the notification)
values = [defaults values];
if (values)
{
// Required parameters for the Web interface
if (![[defaults stringForKey: @"ReplyPlacement"] length])
[defaults setObject: defaultReplyPlacement forKey: @"ReplyPlacement"];
if (![[defaults stringForKey: @"SignaturePlacement"] length])
[defaults setObject: defaultSignaturePlacement forKey: @"SignaturePlacement"];
if (![[defaults stringForKey: @"MessageForwarding"] length])
[defaults setObject: defaultMessageForwarding forKey: @"MessageForwarding"];
if (![[defaults stringForKey: @"MessageCheck"] length])
[defaults setObject: defaultMessageCheck forKey: @"MessageCheck"];
// We propagate the loaded user defaults to other sogod instances
// which will cache them in SOGoCache (including for the instance
// that actually posts the notification)
d = [NSMutableDictionary dictionary];
[d setObject: values forKey: @"values"];
[d setObject: login forKey: @"uid"];