From 3b64c4c76528d8f36d8e8ec493efdd809285de6b Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 12 Apr 2012 23:41:47 +0000 Subject: [PATCH] Monotone-Parent: d62b88251dbc88a5f0e5988172e839b00b7a0f14 Monotone-Revision: 5778b1ee87b79a304c367a6cb34c9823e5935f15 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-04-12T23:41:47 --- ChangeLog | 2 ++ SoObjects/Appointments/SOGoAppointmentFolder.m | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9cbb91fa7..9ca6a3a72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ * SoObjects/Appointments/SOGoAppointmentFolder.m (-davCalendarComponentSet): componentSet is now an ivar. Include VTODO only with showCalendarTasks returns YES. + (-davResourceType): return vtodo-collection only when + showCalendarTasks returns YES. * UI/Scheduler/UIxCalListingActions.m (_fetchFields:forComponentOfType:): do not check for diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index e2833640a..c2d568c41 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -2026,9 +2026,12 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir gdVEventCol = [NSArray arrayWithObjects: [gdRT objectAtIndex: 0], XMLNS_GROUPDAV, nil]; [colType addObject: gdVEventCol]; - gdVTodoCol = [NSArray arrayWithObjects: [gdRT objectAtIndex: 1], - XMLNS_GROUPDAV, nil]; - [colType addObject: gdVTodoCol]; + if ([self showCalendarTasks]) + { + gdVTodoCol = [NSArray arrayWithObjects: [gdRT objectAtIndex: 1], + XMLNS_GROUPDAV, nil]; + [colType addObject: gdVTodoCol]; + } if ([nameInContainer isEqualToString: @"personal"]) [colType addObject: [NSArray arrayWithObjects: @"schedule-outbox", XMLNS_CALDAV, nil]];