1.1 --- a/imiptools/handlers/person_outgoing.py Thu Feb 12 22:35:16 2015 +0100
1.2 +++ b/imiptools/handlers/person_outgoing.py Thu Feb 12 22:41:50 2015 +0100
1.3 @@ -62,12 +62,7 @@
1.4 # Set the complete event if not an additional occurrence.
1.5
1.6 event = self.obj.to_node()
1.7 - recurrenceid = self.obj.get_value("RECURRENCE-ID")
1.8 -
1.9 - if not recurrenceid:
1.10 - self.store.set_event(identity, self.uid, event)
1.11 - else:
1.12 - self.store.set_recurrence(identity, self.uid, recurrenceid, event)
1.13 + self.store.set_event(identity, self.uid, self.recurrenceid, event)
1.14
1.15 else:
1.16 organiser_item, attendees = self.require_organiser_and_attendees(from_organiser)
1.17 @@ -75,7 +70,7 @@
1.18
1.19 # Remove any associated request.
1.20
1.21 - self.store.dequeue_request(identity, self.uid)
1.22 + self.store.dequeue_request(identity, self.uid, self.recurrenceid)
1.23
1.24 # Update free/busy information.
1.25
1.26 @@ -123,7 +118,7 @@
1.27 given_attendees = set(uri_values(self.obj.get_values("ATTENDEE")))
1.28
1.29 if given_attendees == all_attendees:
1.30 - self.store.cancel_event(identity, self.uid)
1.31 + self.store.cancel_event(identity, self.uid, self.recurrenceid)
1.32
1.33 # Otherwise, remove the given attendees and update the event.
1.34
1.35 @@ -141,16 +136,11 @@
1.36 # Set the complete event if not an additional occurrence.
1.37
1.38 event = obj.to_node()
1.39 - recurrenceid = obj.get_value("RECURRENCE-ID")
1.40 -
1.41 - if not recurrenceid:
1.42 - self.store.set_event(identity, self.uid, event)
1.43 - else:
1.44 - self.store.set_recurrence(identity, self.uid, recurrenceid, event)
1.45 + self.store.set_event(identity, self.uid, self.recurrenceid, event)
1.46
1.47 # Remove any associated request.
1.48
1.49 - self.store.dequeue_request(identity, self.uid)
1.50 + self.store.dequeue_request(identity, self.uid, self.recurrenceid)
1.51
1.52 # Update free/busy information.
1.53