diff --git a/ChangeLog b/ChangeLog index a403c4f0b..47e5e8a93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-07-22 Wolfgang Sourdeau + + * SoObjects/Appointments/SOGoUserFolder+Appointments.m + (-davCalendarScheduleInboxURL, -davCalendarScheduleOutboxURL) + (-davDropboxHomeURL, -davNotificationsURL): proxied methods to a + common accessor. + 2009-07-21 Cyril Robert * UI/Scheduler/UIxCalendarProperties.m: Prevent doing anything when not diff --git a/SoObjects/Appointments/SOGoUserFolder+Appointments.m b/SoObjects/Appointments/SOGoUserFolder+Appointments.m index 46a5b5eaf..3031ee8df 100644 --- a/SoObjects/Appointments/SOGoUserFolder+Appointments.m +++ b/SoObjects/Appointments/SOGoUserFolder+Appointments.m @@ -91,56 +91,37 @@ return [NSArray arrayWithObject: tag]; } +- (NSArray *) _davPersonalCalendarURL +{ + NSArray *tag; + SOGoAppointmentFolders *parent; + + parent = [self privateCalendars: @"Calendar" inContext: context]; + tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D", + [NSString stringWithFormat: @"%@personal/", [[parent davURL] path]], + nil]; + + return [NSArray arrayWithObject: tag]; +} + - (NSArray *) davCalendarScheduleInboxURL { - NSArray *tag; - SOGoAppointmentFolders *parent; - - parent = [self privateCalendars: @"Calendar" inContext: context]; - tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D", - [NSString stringWithFormat: @"%@personal/", [[parent davURL] path]], - nil]; - - return [NSArray arrayWithObject: tag]; + return [self _davPersonalCalendarURL]; } -- (NSString *) davCalendarScheduleOutboxURL +- (NSArray *) davCalendarScheduleOutboxURL { - NSArray *tag; - SOGoAppointmentFolders *parent; - - parent = [self privateCalendars: @"Calendar" inContext: context]; - tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D", - [NSString stringWithFormat: @"%@personal/", [[parent davURL] path]], - nil]; - - return [NSArray arrayWithObject: tag]; + return [self _davPersonalCalendarURL]; } -- (NSString *) davDropboxHomeURL +- (NSArray *) davDropboxHomeURL { - NSArray *tag; - SOGoAppointmentFolders *parent; - - parent = [self privateCalendars: @"Calendar" inContext: context]; - tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D", - [NSString stringWithFormat: @"%@personal/", [[parent davURL] path]], - nil]; - - return [NSArray arrayWithObject: tag]; + return [self _davPersonalCalendarURL]; } -- (NSString *) davNotificationsURL +- (NSArray *) davNotificationsURL { - NSArray *tag; - SOGoAppointmentFolders *parent; - - parent = [self privateCalendars: @"Calendar" inContext: context]; - tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D", - [NSString stringWithFormat: @"%@personal/", [[parent davURL] path]], - nil]; - - return [NSArray arrayWithObject: tag]; + return [self _davPersonalCalendarURL]; } - (WOResponse *) _prepareResponseFromContext: (WOContext *) queryContext