amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-27 07:49:29 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 605af413c10fbef80e5952f773c4450ffface034

Browse Source 
Monotone-Revision: 407012b144380da01f4b13cfb23faba545da887a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-19T14:48:07
This commit is contained in:
Wolfgang Sourdeau
2012-04-19 14:48:07 +00:00
parent d2d1c1e104
commit 6a6982bd89
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,5 +1,9 @@
2012-04-19 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoParentFolder.m (-appendSubscribedSources):
ensure the array set as values in the settings dicts are not nil
prior to setting them.
* SoObjects/Appointments/SOGoAppointmentFolder.m
(-fetchFields:from:to:title:component:additionalFilters:includeProtectedInformation:):
fix the date condition for cycle record, by using c_cycleenddate

17
SoObjects/SOGo/SOGoParentFolder.m
View File

@@ -293,11 +293,10 @@ static SoSecurityManager *sm = nil;
subscribedReferences = [NSMutableArray arrayWithArray: [[settings objectForKey: nameInContainer]
objectForKey: @"SubscribedFolders"]];
o = [[settings objectForKey: nameInContainer] objectForKey: @"FolderDisplayNames"];
folderDisplayNames = nil;
if (o)
folderDisplayNames = [NSMutableDictionary dictionaryWithDictionary: o];
else
folderDisplayNames = nil;
allKeys = [subscribedReferences objectEnumerator];
while ((currentKey = [allKeys nextObject]))
@@ -315,12 +314,12 @@ static SoSecurityManager *sm = nil;
// If we changed the folder subscribtion list, we must sync it
if (dirty)
{
id o;
[[settings objectForKey: nameInContainer] setObject: subscribedReferences
forKey: @"SubscribedFolders"];
[[settings objectForKey: nameInContainer] setObject: folderDisplayNames
forKey: @"FolderDisplayNames"];
if (subscribedReferences)
[[settings objectForKey: nameInContainer] setObject: subscribedReferences
forKey: @"SubscribedFolders"];
if (folderDisplayNames)
[[settings objectForKey: nameInContainer] setObject: folderDisplayNames
forKey: @"FolderDisplayNames"];
}
return error;