merge of '5676ae3c13c58684d5b39a82a4ce2aeafdfc7040'

and 'c1871a78b402c35ce922ac5da7c7d2256dc9bb0c'

Monotone-Parent: 5676ae3c13c58684d5b39a82a4ce2aeafdfc7040
Monotone-Parent: c1871a78b402c35ce922ac5da7c7d2256dc9bb0c
Monotone-Revision: c43d9919f8f332369324d9caae4a46a303f32fa6

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-10-08T19:54:59
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-10-08 19:54:59 +00:00
6 changed files with 96 additions and 35 deletions
+15
View File
@@ -9,6 +9,21 @@
2010-10-08 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m
(-removeFolderSettings:withReference:): new method which removes
the settings for keys "FreeBusyExclusions", "FolderColors",
"FolderShowAlarms", "FolderShowTasks", "InactiveFolders",
"FolderSyncTags" and "FolderSynchronize". Code taken from
-[SOGoGCSFolder subscribeUser:reallyDo:].
* SoObjects/SOGo/SOGoGCSFolder.m
(-removeFolderSettings:withReference:): new overridable method
which enables the removal of user settings pertaining to a folder
and its type when deleting the folder or unsubscribing from it.
This implementation removes the folder reference from the
"FolderDisplayNames" key.
(-delete): make use of the new method above.
* UI/WebServerResources/ContactsUI.js: (setEventsOnAddressBook)
enable the "dblclick" event on non-owned addressbooks, except the
public ones (owned by "nobody")