From 0c72f5a4e78153e68daddade0eb30ccbf3d735f2 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Sun, 22 Mar 2009 13:53:06 +0000 Subject: [PATCH] Reverted patch http://mtn.inverse.ca/revision/diff/b8dd0da637c01e983924030f920c45d1581a5e95/with/f845aee937de02ccc5aaec9e4f9592ddeea27abf Monotone-Parent: dd801fb79b02bbd4a7188003ad3ff641cd9840e7 Monotone-Revision: f7a4e6329dc23e00a3a0de99cd95bb15d432656d Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2009-03-22T13:53:06 Monotone-Branch: ca.inverse.sogo --- SoObjects/SOGo/SOGoUser.m | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m index 3204b917c..1abd7acf7 100644 --- a/SoObjects/SOGo/SOGoUser.m +++ b/SoObjects/SOGo/SOGoUser.m @@ -459,19 +459,20 @@ _timeValue (NSString *key) defaults = [self primaryUserDefaults]; if (defaults) { + // Required parameters for the Web interface. This will trigger the + // preferences to load so it's important to leave those calls here. + 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"]; + 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)