From b784b61d5fc66294a8349a4c459f3b0b1bebbbbf Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 5 Jun 2007 19:33:44 +0000
Subject: [PATCH] Monotone-Parent: a11424d99fd81b4c47bf7609d4e4e9ec4e1b0ab2
 Monotone-Revision: 918ac4e60f7f32fc192712b48660266566230db7

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-06-05T19:33:44
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                      | 5 +++++
 SoObjects/Appointments/SOGoAppointmentObject.m | 8 +++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 415c50a45..6ded5d610 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-06-05  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Appointments/SOGoAppointmentObject.m: the owner of the
+	object must be present in the list of UIDs we delete the object
+	from. Otherwise Calendar objects having no organizer and no
+	attendees will remain in their owner's Calendar.
+
 	* SoObjects/SOGo/SOGoObject.m ([SOGoObject
 	-_urlPreferringParticle:expectedoverThisOne:possible]): remove the
 	first 3 elements of the path array if the url returned by
diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 37a7301af..1b7a673ea 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -373,8 +373,7 @@
      - send iMIP mail for all folders not found
   */
   iCalEvent *apt;
-  NSArray *removedUIDs;
-  NSMutableArray *attendees;
+  NSMutableArray *attendees, *removedUIDs;
 
   /* load existing content */
 
@@ -386,7 +385,10 @@
 //     // TODO
 //   }
   
-  removedUIDs = [self attendeeUIDsFromAppointment:apt];
+  removedUIDs = [NSMutableArray arrayWithArray:
+				  [self attendeeUIDsFromAppointment: apt]];
+  if (![removedUIDs containsObject: owner])
+    [removedUIDs addObject: owner];
 
   if ([self sendEMailNotifications])
     {