Monotone-Parent: ceedc9609b867251993d3e5105a1c556a13c7f48

Monotone-Revision: 18a2136e7e775fc22d94d6a7805e474939c22f28

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-07-07T18:49:48
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
C Robert
2009-07-07 18:49:48 +00:00
parent 73c5d33131
commit 9cde046794
2 changed files with 12 additions and 11 deletions
+1
View File
@@ -9,6 +9,7 @@
* UI/WebServerResources/MailerUI.js: Fixed Mantis #45
* UI/WebServerResources/ContactsUI.js: Fixed Mantis #45
* UI/MailerUI/UIxMailListView.m: Made "Size" column sortable
* SoObjects/SOGo/SOGoGCSFolder.m: Fixed Mantis #48
2009-07-03 Wolfgang Sourdeau <wsourdeau@inverse.ca>
+11 -11
View File
@@ -655,10 +655,10 @@ static NSArray *childRecordFields = nil;
fromMailInvitation: (BOOL) isMailInvitation
inResponse: (WOResponse *) response
{
NSMutableArray *folderSubscription;
NSMutableArray *folderSubscription, *tmpA;
NSString *subscriptionPointer, *mailInvitationURL;
NSUserDefaults *ud;
NSMutableDictionary *moduleSettings, *tmp;
NSMutableDictionary *moduleSettings, *tmpD;
if ([owner isEqualToString: [subscribingUser login]])
{
@@ -692,17 +692,17 @@ static NSArray *childRecordFields = nil;
[folderSubscription addObjectUniquely: subscriptionPointer];
else
{
tmp = [moduleSettings objectForKey: @"FolderColors"];
if (tmp)
[tmp removeObjectForKey: subscriptionPointer];
tmpD = [moduleSettings objectForKey: @"FolderColors"];
if (tmpD)
[tmpD removeObjectForKey: subscriptionPointer];
tmp = [moduleSettings objectForKey: @"InactiveFolders"];
if (tmp)
[tmp removeObjectForKey: subscriptionPointer];
tmpA = [moduleSettings objectForKey: @"InactiveFolders"];
if (tmpA)
[tmpA removeObject: [self nameInContainer]];
tmp = [moduleSettings objectForKey: @"FolderSyncTags"];
if (tmp)
[tmp removeObjectForKey: subscriptionPointer];
tmpD = [moduleSettings objectForKey: @"FolderSyncTags"];
if (tmpD)
[tmpD removeObjectForKey: subscriptionPointer];
[folderSubscription removeObject: subscriptionPointer];
}