From 1f987c15bedad4886856f3bab105e2abd8c9b79c Mon Sep 17 00:00:00 2001 From: C Robert Date: Wed, 1 Jul 2009 20:25:20 +0000 Subject: [PATCH 1/3] Monotone-Parent: 7b1c90d751a6ba1af3047dcf85c17673325dfcfe Monotone-Revision: 061cc2eb8f9bda5061964762be7e29f658995ea6 Monotone-Author: crobert@inverse.ca Monotone-Date: 2009-07-01T20:25:20 Monotone-Branch: ca.inverse.sogo --- SoObjects/SOGo/SOGoGCSFolder.m | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m index cac055133..d61753adf 100644 --- a/SoObjects/SOGo/SOGoGCSFolder.m +++ b/SoObjects/SOGo/SOGoGCSFolder.m @@ -658,7 +658,7 @@ static NSArray *childRecordFields = nil; NSMutableArray *folderSubscription; NSString *subscriptionPointer, *mailInvitationURL; NSUserDefaults *ud; - NSMutableDictionary *moduleSettings; + NSMutableDictionary *moduleSettings, *tmp; if ([owner isEqualToString: [subscribingUser login]]) { @@ -692,8 +692,18 @@ static NSArray *childRecordFields = nil; [folderSubscription addObjectUniquely: subscriptionPointer]; else { - [[moduleSettings objectForKey: @"FolderColors"] - removeObjectForKey: subscriptionPointer]; + tmp = [moduleSettings objectForKey: @"FolderColors"]; + if (tmp) + [tmp removeObjectForKey: subscriptionPointer]; + + tmp = [moduleSettings objectForKey: @"InactiveFolders"]; + if (tmp) + [tmp removeObjectForKey: subscriptionPointer]; + + tmp = [moduleSettings objectForKey: @"FolderSyncTags"]; + if (tmp) + [tmp removeObjectForKey: subscriptionPointer]; + [folderSubscription removeObject: subscriptionPointer]; } From 996e33f5da0dcf195437b75a0cf08e76dbaae0a7 Mon Sep 17 00:00:00 2001 From: C Robert Date: Wed, 1 Jul 2009 20:26:13 +0000 Subject: [PATCH 2/3] Monotone-Parent: 061cc2eb8f9bda5061964762be7e29f658995ea6 Monotone-Revision: f84964a7533853d3b5d8297f297226c300ddbc47 Monotone-Author: crobert@inverse.ca Monotone-Date: 2009-07-01T20:26:13 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2be69a423..1d2532981 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ * SoObjects/SOGo/SOGoGCSFolder.m: Remove color from user settings on unsubscribe. + * SoObjects/SOGo/SOGoGCSFolder.m: Re-fixed to also remove from InactiveFolders + and FolderSyncTags. * UI/MailerUI/UIxMailFolderActions.m (_trashedURLOfFolder:withCO:): Fixed issue when deleting a folder with the same name as one already in the Trash. From aebc17edf00e8b55b3b268083334fa7f4696699b Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 2 Jul 2009 12:39:37 +0000 Subject: [PATCH 3/3] Updated NEWS file Monotone-Parent: f84964a7533853d3b5d8297f297226c300ddbc47 Monotone-Revision: bde131451e61cf9c2c9b12131c6ea839e28e3bf2 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2009-07-02T12:39:37 Monotone-Branch: ca.inverse.sogo --- NEWS | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 430130bac..4dcf3fa80 100644 --- a/NEWS +++ b/NEWS @@ -3,14 +3,17 @@ - improved search behavior of users folders (UIxContactsUserFolders) - the editor window in the web interface now appears directly when editing an exception occurence of a repeating event (no more dialog window, as in Lightning) - implemented the webdav sync spec from Cyrus Daboo, in order to reduce useless payload on databases +- greatly reduced the number of SQL requests performed in many situations - added HTML composition in the web mail module -- added drag and drop in the addressbook module +- added drag and drop in the address book and email modules +- improved the attendees modification dialog by implementing slots management +- added the capability to display the size of messages in the mail module 1.0-20090605 (1.0.2) -------------------- - basic alarm implementation for the web interface - added Welsh translation, thanks to Iona Bailey -- added Russh translation, thanks to Alex Kabakaev +- added Russian translation, thanks to Alex Kabakaev - added support for Oracle RAC - added "scope" parameter to LDAP sources - now possible to use SSL (or TLS) for LDAP sources