# HG changeset patch # User Matti Hamalainen # Date 1476697436 -10800 # Node ID 7ab6beb4c70993cd68f72364e944b4d6f6d24b1a # Parent b5c381f9b51ff3e36ce5d14f1943e2c0138b2c3d Only generate summaries and colors for non-deleted/cancelled events. diff -r b5c381f9b51f -r 7ab6beb4c709 multimerge.py --- a/multimerge.py Mon Oct 17 12:42:42 2016 +0300 +++ b/multimerge.py Mon Oct 17 12:43:56 2016 +0300 @@ -542,9 +542,10 @@ events = gcm_generate_ids(result.get("items", []), calendar["id"], "___") if events: for event in events: - if c_found != None: - event["colorId"] = c_found - event["summary"] = u"[{1}] {0}".format(event["summary"], calendar["gcm_id"]) + if event["status"] != u"cancelled": + if c_found != None: + event["colorId"] = c_found + event["summary"] = u"[{1}] {0}".format(event["summary"], calendar["gcm_id"]) src_events.extend(events) if gcm_check_debug(4): gcm_dump_events(events, True)