From de2accb0c51bd6567159fe8bfa840f26c3c80e33 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 20 Nov 2007 14:47:05 +0000 Subject: [PATCH] Monotone-Parent: 99678ac51fdef1047f37db7c25c8664b99b53d4b Monotone-Revision: daf854098ad38237d61056322cf6b4b3d59c74de Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-11-20T14:47:05 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ SoObjects/Appointments/SOGoAppointmentObject.m | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fc8949637..1a4b1c0ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-11-20 Wolfgang Sourdeau + + * SoObjects/Appointments/SOGoAppointmentObject.m: don't take an + empty c_name as a valid response when looking up an event. Create + one in that case instead. + 2007-11-19 Wolfgang Sourdeau * UI/PreferencesUI/UIxPreferences.m ([UIxPreferences -signature]): diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m index dac2f2547..b8814b8e7 100644 --- a/SoObjects/Appointments/SOGoAppointmentObject.m +++ b/SoObjects/Appointments/SOGoAppointmentObject.m @@ -73,6 +73,8 @@ if ([object isKindOfClass: [NSException class]]) object = nil; } + else + object = nil; } if (!object) @@ -310,7 +312,8 @@ ex = [self saveContentString: newContent]; if (!(ex || [event userIsOrganizer: [context activeUser]])) { - if ([[attendee rsvp] isEqualToString: @"true"]) + if ([[attendee rsvp] isEqualToString: @"true"] + && [event isStillRelevant]) [self sendResponseToOrganizer]; organizerUID = [[event organizer] uid]; if (organizerUID)