Reverted patch f845aee937
Monotone-Parent: dd801fb79b02bbd4a7188003ad3ff641cd9840e7 Monotone-Revision: f7a4e6329dc23e00a3a0de99cd95bb15d432656d Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2009-03-22T13:53:06 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
fdb6829d3c
commit
0c72f5a4e7
|
@ -459,10 +459,8 @@ _timeValue (NSString *key)
|
||||||
defaults = [self primaryUserDefaults];
|
defaults = [self primaryUserDefaults];
|
||||||
if (defaults)
|
if (defaults)
|
||||||
{
|
{
|
||||||
values = [defaults values];
|
// Required parameters for the Web interface. This will trigger the
|
||||||
if (values)
|
// preferences to load so it's important to leave those calls here.
|
||||||
{
|
|
||||||
// Required parameters for the Web interface
|
|
||||||
if (![[defaults stringForKey: @"ReplyPlacement"] length])
|
if (![[defaults stringForKey: @"ReplyPlacement"] length])
|
||||||
[defaults setObject: defaultReplyPlacement forKey: @"ReplyPlacement"];
|
[defaults setObject: defaultReplyPlacement forKey: @"ReplyPlacement"];
|
||||||
if (![[defaults stringForKey: @"SignaturePlacement"] length])
|
if (![[defaults stringForKey: @"SignaturePlacement"] length])
|
||||||
|
@ -472,6 +470,9 @@ _timeValue (NSString *key)
|
||||||
if (![[defaults stringForKey: @"MessageCheck"] length])
|
if (![[defaults stringForKey: @"MessageCheck"] length])
|
||||||
[defaults setObject: defaultMessageCheck forKey: @"MessageCheck"];
|
[defaults setObject: defaultMessageCheck forKey: @"MessageCheck"];
|
||||||
|
|
||||||
|
values = [defaults values];
|
||||||
|
if (values)
|
||||||
|
{
|
||||||
// We propagate the loaded user defaults to other sogod instances
|
// We propagate the loaded user defaults to other sogod instances
|
||||||
// which will cache them in SOGoCache (including for the instance
|
// which will cache them in SOGoCache (including for the instance
|
||||||
// that actually posts the notification)
|
// that actually posts the notification)
|
||||||
|
|
Loading…
Reference in a new issue