diff --git a/SOPE/sope-patchset-r1623.diff b/SOPE/sope-patchset-r1623.diff index 3ba49a124..1506a2117 100644 --- a/SOPE/sope-patchset-r1623.diff +++ b/SOPE/sope-patchset-r1623.diff @@ -2038,7 +2038,7 @@ Index: sope-appserver/NGObjWeb/DAVPropMap.plist "{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set" = davCalendarComponentSet; "{urn:ietf:params:xml:ns:caldav}supported-calendar-data" = -@@ -138,13 +163,13 @@ +@@ -138,13 +163,14 @@ "{urn:ietf:params:xml:ns:carddav}addressbook-description" = davDescription; /* Apple CalServer */ @@ -2053,6 +2053,7 @@ Index: sope-appserver/NGObjWeb/DAVPropMap.plist + /* Apple extensions */ + "{http://apple.com/ns/ical/}calendar-color" = davCalendarColor; ++ "{http://apple.com/ns/ical/}calendar-order" = davCalendarOrder; + /* GroupDAV */ "{http://www.groupdav.org/}component-set" = gdavComponentSet; diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index 0a9e773f6..3b68efb8f 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -1397,6 +1397,23 @@ static Class sogoAppointmentFolderKlass = Nil; return error; } +- (NSString *) davCalendarOrder +{ + NSArray *siblings; + unsigned int order; + + order = [[container subFolders] indexOfObject: self]; + + return [NSString stringWithFormat: @"%d", order]; +} + +- (NSException *) setDavCalendarOrder: (NSString *) newColor +{ + NSException *error; + + return nil; +} + - (SOGoWebDAVValue *) davCalendarFreeBusySet { NSEnumerator *subFolders; @@ -1754,6 +1771,7 @@ static Class sogoAppointmentFolderKlass = Nil; else if ([url hasSuffix: @"AsAppointment"]) obj = [SOGoAppointmentObject objectWithName: _key inContainer: self]; + [obj setIsNew: YES]; } } if (!obj)