amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-23 12:25:23 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 40c6f56ac0840b5680cd43b2a9d5ef7d03bd69e2

Browse Source 
Monotone-Revision: a969c621c7bdf36505c11f0aaf6e61680e8375f7

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-05-05T23:39:07
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2008-05-05 23:39:07 +00:00
parent f767b4b11e
commit e6e6542d95
3 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+13
View File
@@ -1,3 +1,16 @@
2008-05-05 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/Common/UIxFolderActions.m ([UIxFolderActions -activateFolderAction])
([UIxFolderActions -deactivateFolderAction]): reversed the logic
and remove or add the folder name from/into the 'InactiveFolders'
settings key.
* SoObjects/Appointments/SOGoAppointmentFolder.m
([SOGoAppointmentFolder -create]): no longer write the folder name
in the 'ActiveFolders' settings key.
([-isActive]): returns whether the folder is NOT listed in the
'InactiveFolders' settings key.
2008-05-02 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* Main/SOGo.m ([SOGo -davURL], [SOGo -soURL]): copied methods from
SoObjects/Appointments/SOGoAppointmentFolder.m
+4 -14
View File
@@ -1573,7 +1573,6 @@ static NSNumber *sharedYes = nil;
- (BOOL) create
{
BOOL rc;
NSMutableArray *folderSubscription;
NSUserDefaults *userSettings;
NSMutableDictionary *calendarSettings;
SOGoUser *ownerUser;
@@ -1590,15 +1589,6 @@ static NSNumber *sharedYes = nil;
calendarSettings = [NSMutableDictionary dictionary];
[userSettings setObject: calendarSettings forKey: @"Calendar"];
}
folderSubscription
= [calendarSettings objectForKey: @"ActiveFolders"];
if (!folderSubscription)
{
folderSubscription = [NSMutableArray array];
[calendarSettings setObject: folderSubscription
forKey: @"ActiveFolders"];
}
[folderSubscription addObjectUniquely: nameInContainer];
[userSettings synchronize];
}
@@ -1953,13 +1943,13 @@ static NSNumber *sharedYes = nil;
- (BOOL) isActive
{
NSUserDefaults *settings;
NSArray *activeFolders;
NSArray *inactiveFolders;
settings = [[context activeUser] userSettings];
activeFolders
= [[settings objectForKey: @"Calendar"] objectForKey: @"ActiveFolders"];
inactiveFolders
= [[settings objectForKey: @"Calendar"] objectForKey: @"InactiveFolders"];
return [activeFolders containsObject: nameInContainer];
return ![inactiveFolders containsObject: nameInContainer];
}
@end /* SOGoAppointmentFolder */
UI/Common/UIxFolderActions.m
+4 -4
View File
@@ -180,18 +180,18 @@
[self _setupContext];
folderSubscription
= [moduleSettings objectForKey: @"ActiveFolders"];
= [moduleSettings objectForKey: @"InactiveFolders"];
if (!folderSubscription)
{
folderSubscription = [NSMutableArray array];
[moduleSettings setObject: folderSubscription forKey: @"ActiveFolders"];
[moduleSettings setObject: folderSubscription forKey: @"InactiveFolders"];
}
folderName = [clientObject nameInContainer];
if (makeActive)
[folderSubscription addObjectUniquely: folderName];
else
[folderSubscription removeObject: folderName];
else
[folderSubscription addObjectUniquely: folderName];
[ud synchronize];