From 696108bc775833e94aa5c5d7ad2554f7a8d737f0 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 16 Apr 2010 21:45:19 +0000 Subject: [PATCH] Monotone-Parent: 0dc509f442891adef0778315e5f3971fb4576203 Monotone-Revision: dd017bbdddea8d5340182a7bc5439bfd1c8fd312 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-04-16T21:45:19 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/Appointments/SOGoCalendarComponent.m | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 23678ee00..db529721d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-04-16 Wolfgang Sourdeau + * SoObjects/Appointments/SOGoCalendarComponent.m + (-lookupOccurence:): the looked up occurrence might be the master + event. + * UI/WebServerResources/UIxMailPopupView.js (initPopupMailer): we assign window.messageUID from here now (by concatenating "mailboxName" and "messageName", as it will disappear if the diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m index 2aebb0be3..b20668814 100644 --- a/SoObjects/Appointments/SOGoCalendarComponent.m +++ b/SoObjects/Appointments/SOGoCalendarComponent.m @@ -257,7 +257,8 @@ return iCalString; } -static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence, NSString *recID) +static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence, + NSString *recID) { unsigned int seconds, recSeconds; @@ -290,6 +291,9 @@ static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence, NSStr count++; } } + else if (_occurenceHasID (component, recID)) + /* The "master" event could be that occurrence. */ + occurence = component; return occurence; }