From 14c515bd83b9773880f30f4748505ce4a3d5f1fe Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 15 Jan 2015 13:15:27 -0600 Subject: strengthen the test that decides if an icalcomponent is a one-shot or repeating. --- src/engine-eds.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp index 210ef42..47c7a9b 100644 --- a/src/engine-eds.cpp +++ b/src/engine-eds.cpp @@ -534,8 +534,11 @@ private: icalcomponent * icc = nullptr; if (e_cal_client_get_object_finish (E_CAL_CLIENT(client), result, &icc, nullptr)) { - struct icaltimetype itt = icalcomponent_get_recurrenceid(icc); - if (icaltime_is_null_time(itt)) + auto rrule_property = icalcomponent_get_first_property (icc, ICAL_RRULE_PROPERTY); // transfer none + auto rdate_property = icalcomponent_get_first_property (icc, ICAL_RDATE_PROPERTY); // transfer none + const bool is_nonrepeating = (rrule_property == nullptr) && (rdate_property == nullptr); + + if (is_nonrepeating) { g_debug("'%s' appears to be a one-time alarm... adding 'disabled' tag.", icalcomponent_as_ical_string(icc)); -- cgit v1.2.3