1.1 --- a/imip_manager.py Mon Dec 08 19:21:37 2014 +0100
1.2 +++ b/imip_manager.py Mon Dec 08 19:30:54 2014 +0100
1.3 @@ -260,7 +260,8 @@
1.4
1.5 # Show any conflicts.
1.6
1.7 - for start, end, found_uid in have_conflict(freebusy, [(dtstart, dtend)], True):
1.8 + for t in have_conflict(freebusy, [(dtstart, dtend)], True):
1.9 + start, end, found_uid = t[:3]
1.10 if uid != found_uid:
1.11 start = format_datetime(to_timezone(get_datetime(start), tzid))
1.12 end = format_datetime(to_timezone(get_datetime(end), tzid))
1.13 @@ -321,7 +322,7 @@
1.14
1.15 for t in active:
1.16 if t:
1.17 - start, end, uid, transp = t
1.18 + start, end, uid = t[:3]
1.19 span = spans[uid]
1.20 if point == start:
1.21 page.td(class_="event", rowspan=span)