From 04cb3e51ba7abce1b241c6f206bc7a6ace64dc77 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 23 Apr 2007 17:55:03 +0000 Subject: [PATCH] Monotone-Parent: e84e98a15cb31552c7707dd925faafe74577f1f4 Monotone-Revision: 59a3a2f8dcdf5c1c777169bb3ffa145eaa47d381 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-04-23T17:55:03 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/Appointments/SOGoAppointmentFolder.m | 14 +++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1301fbd51..be8dac0b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2007-04-23 Wolfgang Sourdeau + * SoObjects/Appointments/SOGoAppointmentFolder.m + ([SOGoAppointmentFolder -groupDavResourceType]): return both + "vevent-collection" and "vtodo-collection". + * UI/Common/UIxUserRightsEditor.[hm]: new template class module that implements the detailed editor of user rights per-object. diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index b877f3007..542cbb51e 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -412,22 +412,26 @@ static NSNumber *sharedYes = nil; return classes; } -- (NSString *) groupDavResourceType +- (NSArray *) groupDavResourceType { - return @"vevent-collection"; + return [NSArray arrayWithObjects: @"vevent-collection", + @"vtodo-collection", nil]; } - (NSArray *) davResourceType { static NSArray *colType = nil; - NSArray *gdCol, *cdCol; + NSArray *cdCol; + NSMutableArray *gdCol; if (!colType) { + gdCol = [NSMutableArray new]; + [gdCol addObjectsFromArray: [self groupDavResourceType]]; + [gdCol addObject: XMLNS_GROUPDAV]; cdCol = [NSArray arrayWithObjects: @"calendar", XMLNS_CALDAV, nil]; - gdCol = [NSArray arrayWithObjects: [self groupDavResourceType], - XMLNS_GROUPDAV, nil]; colType = [NSArray arrayWithObjects: @"collection", cdCol, gdCol, nil]; + [gdCol release]; [colType retain]; }