From 5a8b97d2701c9ece8fa385a0d613e1503b3c656c Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 2 Apr 2010 18:50:10 +0000 Subject: [PATCH] Fix for bug #532. See ChangeLog Monotone-Parent: 37f12ad4f4daf31d2b81f43a8d21b5c4a53f4a1d Monotone-Revision: c87ee0c01e17a1a47680ed6ca858c1e5bdcac411 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2010-04-02T18:50:10 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 18 ++++++++++++------ SoObjects/Appointments/SOGoCalendarComponent.m | 2 ++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 78e21d7cf..553d97000 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2010-04-02 Francis Lachapelle + + * SoObjects/Appointments/SOGoCalendarComponent.m + (-sendEMailUsingTemplateNamed:forObject:previousObject:toAttendees:): + when looking for the organizer email, we now rely on the previous + event when the organizer is not defined in the new event. This is + important when the organizer is deleting the only attendee of an event. + + * UI/WebServerResources/SchedulerUI.js (onClickableCellsDblClick): + hack to ignore double-click in the scrollbar in the month view & + fix for Firefox. + 2010-04-02 Wolfgang Sourdeau * UI/Scheduler/UIxCalListingActions.m @@ -5,12 +17,6 @@ length of an event would happen after the period covered by the freebusy. -2010-04-02 Francis Lachapelle - - * UI/WebServerResources/SchedulerUI.js (onClickableCellsDblClick): - hack to ignore double-click in the scrollbar in the month view & - fix for Firefox. - 2010-03-31 Wolfgang Sourdeau * Tools/sogo-slapd-sockd.m, Tools/SOGoSockDOperation.m, diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m index 24df01a89..226599320 100644 --- a/SoObjects/Appointments/SOGoCalendarComponent.m +++ b/SoObjects/Appointments/SOGoCalendarComponent.m @@ -677,6 +677,8 @@ static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence, NSStr // senderEmail = [NSString stringWithFormat: @"%@ <%@>", // [ownerUser cn], shortSenderEmail]; shortSenderEmail = [[object organizer] rfc822Email]; + if (![shortSenderEmail length]) + shortSenderEmail = [[previousObject organizer] rfc822Email]; senderEmail = [[object organizer] mailAddress]; // NSLog (@"sending '%@' from %@", // [(iCalCalendar *) [object parent] method], senderEmail);