From 1f987c15bedad4886856f3bab105e2abd8c9b79c Mon Sep 17 00:00:00 2001 From: C Robert Date: Wed, 1 Jul 2009 20:25:20 +0000 Subject: [PATCH] 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]; }