1.1 --- a/imip_manager.py Fri Mar 06 00:07:09 2015 +0100
1.2 +++ b/imip_manager.py Fri Mar 06 00:07:47 2015 +0100
1.3 @@ -1166,6 +1166,8 @@
1.4 dtstart = format_datetime(obj.get_utc_datetime("DTSTART"))
1.5 dtend = format_datetime(obj.get_utc_datetime("DTEND"))
1.6
1.7 + periods = obj.get_periods_for_freebusy(self.get_tzid(), self.get_window_end())
1.8 +
1.9 # Indicate whether there are conflicting events.
1.10
1.11 freebusy = self.store.get_freebusy(self.user)
1.12 @@ -1179,7 +1181,7 @@
1.13
1.14 # Show any conflicts.
1.15
1.16 - conflicts = [t for t in have_conflict(freebusy, [(dtstart, dtend)], True) if t[2] != uid]
1.17 + conflicts = [t for t in have_conflict(freebusy, periods, True) if t[2] != uid]
1.18
1.19 if conflicts:
1.20 page.p("This event conflicts with others:")