From f348bd3211d131fa4250827198d455add29043f9 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Tue, 24 Jul 2012 13:58:47 +0000 Subject: [PATCH 1/2] Fix for bug #1888 Monotone-Parent: 247bc51241f490e20ac9abc386e95d4198cefbaf Monotone-Revision: 5c693d8846aabef79f3f26fae416c99fe51bed78 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2012-07-24T13:58:47 --- SoObjects/Appointments/SOGoCalendarComponent.m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m index 910c78b9b..119888ab0 100644 --- a/SoObjects/Appointments/SOGoCalendarComponent.m +++ b/SoObjects/Appointments/SOGoCalendarComponent.m @@ -289,6 +289,7 @@ iCalCalendar *calendar; NSCalendarDate *recDate; NSTimeZone *timeZone; + iCalPerson *organizer; recDate = [NSCalendarDate dateWithTimeIntervalSince1970: [recID intValue]]; masterOccurence = [self component: NO secure: NO]; @@ -298,11 +299,12 @@ if ([masterOccurence doesOccurOnDate: recDate]) { newOccurence = [masterOccurence mutableCopy]; + organizer = [masterOccurence organizer]; [newOccurence autorelease]; [newOccurence removeAllRecurrenceRules]; [newOccurence removeAllExceptionRules]; [newOccurence removeAllExceptionDates]; - [newOccurence setOrganizer: nil]; + [newOccurence setOrganizer: organizer]; [newOccurence setRecurrenceId: recDate]; calendar = [masterOccurence parent]; From dbdba16168233ab63d3afdd66cbb4955e9342766 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Tue, 24 Jul 2012 14:08:56 +0000 Subject: [PATCH 2/2] Added comment in the code regarding previous commit Monotone-Parent: e7b38d4230f362ff9d71b2d1bfa8af9b8a2e80c6 Monotone-Revision: 90e0a15d1fa7861aebb988530cf5503d63b9b9c0 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2012-07-24T14:08:56 --- SoObjects/Appointments/SOGoCalendarComponent.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m index 119888ab0..11ff46f81 100644 --- a/SoObjects/Appointments/SOGoCalendarComponent.m +++ b/SoObjects/Appointments/SOGoCalendarComponent.m @@ -304,6 +304,11 @@ [newOccurence removeAllRecurrenceRules]; [newOccurence removeAllExceptionRules]; [newOccurence removeAllExceptionDates]; + + // It is important to set the organizer as some DAV clients (iCal + // and Thunderbird 10/Lightning 1.2) will prompt the event "edition" + // dialog instead of the event "invitation" (for accept/decline/tentative) + // if the organizer isn't found in a specific recurrence [newOccurence setOrganizer: organizer]; [newOccurence setRecurrenceId: recDate];