From 92add375c61e3dade58e9b520e3dee205b126ca4 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 1 Jun 2007 04:08:19 +0000 Subject: [PATCH] Monotone-Parent: 9592640aebbff2d0647f3a04e1afca2b9579d1ba Monotone-Revision: 38b9ad0f82da6f3240df35e97f591af056f15769 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-06-01T04:08:19 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 5 +++ .../Appointments/SOGoAppointmentObject.m | 33 +------------------ 2 files changed, 6 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index 09c8a6965..5383cff0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2007-06-01 Wolfgang Sourdeau + * SoObjects/Appointments/SOGoAppointmentObject.m + ([SOGoAppointmentObject + -saveContentString:contentStringbaseVersion:baseVersion]): remove + method since an event may not have an organizer. + * SoObjects/SOGo/SOGoObject.m ([SOGoObject -GETAction:localContext]): clarified method. Added support for content-type (thanks to Helge Hess). diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m index 691ed36ed..37a7301af 100644 --- a/SoObjects/Appointments/SOGoAppointmentObject.m +++ b/SoObjects/Appointments/SOGoAppointmentObject.m @@ -410,7 +410,7 @@ /* perform */ - return [self deleteInUIDs:removedUIDs]; + return [self deleteInUIDs: removedUIDs]; } - (NSException *) saveContentString: (NSString *) _iCalString @@ -425,35 +425,4 @@ return @"IPM.Appointment"; } -- (NSException *) saveContentString: (NSString *) contentString - baseVersion: (unsigned int) baseVersion -{ - NSString *newContentString, *oldContentString; - iCalCalendar *eventCalendar; - iCalEvent *event; - iCalPerson *organizer; - NSArray *organizers; - - oldContentString = [self contentAsString]; - if (oldContentString) - newContentString = contentString; - else - { - eventCalendar = [iCalCalendar parseSingleFromSource: contentString]; - event = (iCalEvent *) [eventCalendar firstChildWithTag: [self componentTag]]; - organizers = [event childrenWithTag: @"organizer"]; - if ([organizers count]) - newContentString = contentString; - else - { - organizer = [self iCalPersonWithUID: [self ownerInContext: context]]; - [event setOrganizer: organizer]; - newContentString = [eventCalendar versitString]; - } - } - - return [super saveContentString: newContentString - baseVersion: baseVersion]; -} - @end /* SOGoAppointmentObject */