1.1 --- a/imiptools/handlers/person_outgoing.py	Sat Oct 17 01:01:44 2015 +0200
     1.2 +++ b/imiptools/handlers/person_outgoing.py	Sat Oct 17 01:03:37 2015 +0200
     1.3 @@ -76,6 +76,10 @@
     1.4  
     1.5          self.store.set_event(self.user, self.uid, self.recurrenceid, self.obj.to_node())
     1.6  
     1.7 +        # Remove any previous cancellations involving this event.
     1.8 +
     1.9 +        self.store.remove_cancellation(self.user, self.uid, self.recurrenceid)
    1.10 +
    1.11          # Update free/busy information.
    1.12  
    1.13          self.update_event_in_freebusy()

     2.1 --- a/imiptools/handlers/resource.py	Sat Oct 17 01:01:44 2015 +0200
     2.2 +++ b/imiptools/handlers/resource.py	Sat Oct 17 01:03:37 2015 +0200
     2.3 @@ -69,6 +69,10 @@
     2.4          self.update_recurrenceid()
     2.5          self.store.set_event(self.user, self.uid, self.recurrenceid, self.obj.to_node())
     2.6  
     2.7 +        # Remove any previous cancellations involving this event.
     2.8 +
     2.9 +        self.store.remove_cancellation(self.user, self.uid, self.recurrenceid)
    2.10 +
    2.11          # Update free/busy information.
    2.12  
    2.13          self.update_event_in_freebusy(for_organiser=False)