git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1217 d1b88da0-ebda-0310...

diff --git a/ChangeLog b/ChangeLog
index 8882bd8899efcbb33c127874a8295da02fa12226..b865d14f9149a605fd176ada094d7eae3f1e5176 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-11-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+       * SoObjects/Appointments/SOGoAppointmentObject.m
+       ([SOGoAppointmentObject -deleteWithBaseSequence:]): an email was
+       sent when modifying an event, when the event was considered
+       relevant. The same thing is now implemented for event deletion.
+
        * SoObjects/SOGo/AgenorUserDefaults.m ([AgenorUserDefaults
        -primaryFetchProfile]): make sure that the deserialized "values"
        is an instance of NSMutableDictionary, otherwise we override it

diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 404428ea716f82fab37d1241669b6af2c163e1b0..c4c94371474c1e6bcc8f10ed875fa34ea2fa2d32 100644 (file)
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -397,7 +397,8 @@
   if (![removedUIDs containsObject: owner])
     [removedUIDs addObject: owner];
 
-  if ([self sendEMailNotifications])
+  if ([self sendEMailNotifications]
+      && [self _aptIsStillRelevant: apt])
     {
       /* send notification email to attendees excluding organizer */
       attendees = [NSMutableArray arrayWithArray:[apt attendees]];