merge of '4c570fedd8a0bf2a5ec231caa2b981bd796da85b'

and 'a98828a2111fc135396157fa30a08e62d44cec82'

Monotone-Parent: 4c570fedd8a0bf2a5ec231caa2b981bd796da85b
Monotone-Parent: a98828a2111fc135396157fa30a08e62d44cec82
Monotone-Revision: 45249fe68411e1b5ecd968fb87f91801d6882115

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-01-21T20:53:54
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-01-21 20:53:54 +00:00
commit 2df89a88ca
3 changed files with 3 additions and 3 deletions

View File

@ -138,7 +138,7 @@
return component;
}
- (NSException *) prepareDelete;
- (NSException *) prepareDelete
{
NSArray *occurences;
NSCalendarDate *recurrenceId, *currentId;

View File

@ -14,7 +14,7 @@
SOGoWebAppointmentFolder = {
superclass = "SOGoGCSFolder";
defaultRoles = {
"Add Documents, Images, and Files" = ( );
"Add Documents, Images, and Files" = ( "ImpossibleWriter" );
"Access Contents Information" = ( "Owner", "PublicResponder", "PublicModifier", "PublicViewer", "PublicDAndTViewer", "PrivateResponder", "PrivateModifier", "PrivateViewer", "PrivateDAndTViewer", "ConfidentialResponder", "ConfidentialModifier", "ConfidentialViewer", "ConfidentialDAndTViewer" );
"ViewWholePublicRecords" = ( "Owner", "PublicResponder", "PublicModifier", "PublicViewer" );
"ViewWholePrivateRecords" = ( "Owner", "PrivateResponder", "PrivateModifier", "PrivateViewer" );

View File

@ -153,7 +153,7 @@
// We check to see if it's a group
classes = [[entry attributeWithName: @"objectClass"] allStringValues];
NSLog(@"classes for %@ = %@", theValue, classes);
// NSLog(@"classes for %@ = %@", theValue, classes);
// Found a group, let's return it.
if ([classes containsObject: @"group"] ||