LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: 93f5621e5282201f7b9a61447d23a396e8f682a4 

Monotone-Revision: 1da41bffe0d25476b6f909fd1621c5026cdf59ee

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-03-23T19:04:31
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2009-03-23 19:04:31 +00:00
parent 03055a3444
commit 8715ec448b
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2009-03-23 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoGCSFolder.m ([SOGoGCSFolder
-subscribe:reallyDoinTheNamesOf:delegatedUsersfromMailInvitation:isMailInvitationinContext:localContext]):
when the user preferences didn't already contain a key matching
the current module name, the subscriptions would not work. We thus
create one if none exists yet.
* SoObjects/Contacts/SOGoContactFolders.m ([SOGoContactFolders
-appendSystemSources]): modified the return type and returns nil,
to match the new SOGoParentFolder definition of the method.

12
SoObjects/SOGo/SOGoGCSFolder.m
View File

@ -621,9 +621,6 @@ static NSArray *childRecordFields = nil;
NSUserDefaults *ud;
NSMutableDictionary *moduleSettings;
ud = [subscribingUser userSettings];
moduleSettings = [ud objectForKey: [container nameInContainer]];
if ([owner isEqualToString: [subscribingUser login]])
{
[response setStatus: 403];
@ -632,6 +629,15 @@ static NSArray *childRecordFields = nil;
}
else
{
ud = [subscribingUser userSettings];
moduleSettings = [ud objectForKey: [container nameInContainer]];
if (!(moduleSettings
&& [moduleSettings isKindOfClass: [NSMutableDictionary class]]))
{
moduleSettings = [NSMutableDictionary dictionary];
[ud setObject: moduleSettings forKey: [container nameInContainer]];
}
folderSubscription
= [moduleSettings objectForKey: @"SubscribedFolders"];
if (!(folderSubscription