diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m index 5b300be41..724552c97 100644 --- a/SoObjects/Appointments/SOGoAppointmentObject.m +++ b/SoObjects/Appointments/SOGoAppointmentObject.m @@ -2187,13 +2187,14 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent // of its identity (which is different than the email address associated with // the mail account) prior doing a calendar refresh. NSMutableArray *attendees; - NSString *partStat; + iCalPerson *participant; attendees = [NSMutableArray arrayWithArray: [newEvent attendeesWithoutUser: [SOGoUser userWithLogin: owner]]]; - partStat = [newEvent participationStatusForUser: [SOGoUser userWithLogin: owner] - attendee: attendee]; - [attendee setPartStat: partStat]; + participant = [newEvent participantForUser: [SOGoUser userWithLogin: owner] + attendee: attendee]; + [attendee setPartStat: [participant partStat]]; + [attendee setDelegatedTo: [participant delegatedTo]]; [attendees addObject: attendee]; [newEvent setAttendees: attendees]; } diff --git a/SoObjects/Appointments/iCalEntityObject+SOGo.h b/SoObjects/Appointments/iCalEntityObject+SOGo.h index 913863968..ee0c62cc7 100644 --- a/SoObjects/Appointments/iCalEntityObject+SOGo.h +++ b/SoObjects/Appointments/iCalEntityObject+SOGo.h @@ -39,8 +39,8 @@ extern NSNumber *iCalDistantFutureNumber; - (iCalPerson *) userAsAttendee: (SOGoUser *) user; -- (NSString *) participationStatusForUser: (SOGoUser *) theUser - attendee: (iCalPerson *) theAttendee; +- (iCalPerson *) participantForUser: (SOGoUser *) theUser + attendee: (iCalPerson *) theAttendee; - (NSArray *) attendeeUIDs; - (BOOL) isStillRelevant; diff --git a/SoObjects/Appointments/iCalEntityObject+SOGo.m b/SoObjects/Appointments/iCalEntityObject+SOGo.m index ef278176d..6e57e963a 100644 --- a/SoObjects/Appointments/iCalEntityObject+SOGo.m +++ b/SoObjects/Appointments/iCalEntityObject+SOGo.m @@ -99,8 +99,8 @@ NSNumber *iCalDistantFutureNumber = nil; return userAttendee; } -- (NSString *) participationStatusForUser: (SOGoUser *) theUser - attendee: (iCalPerson *) theAttendee +- (iCalPerson *) participantForUser: (SOGoUser *) theUser + attendee: (iCalPerson *) theAttendee { iCalPerson *currentAttendee; NSEnumerator *attendees; @@ -122,9 +122,9 @@ NSNumber *iCalDistantFutureNumber = nil; } if ([a count] > 0) - return [[a objectAtIndex: 0] partStat]; + return [a objectAtIndex: 0]; - return [theAttendee partStat]; + return theAttendee; } - (BOOL) userIsOrganizer: (SOGoUser *) user