From b115811bcafc3ce5193dc75cb7929a8f3f2cba00 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 24 Mar 2015 13:42:16 -0500 Subject: add support for an x-canonical-app-url x-prop when reading vtodos/vevents from EDS --- src/engine-eds.cpp | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp index 47c7a9b..8408a57 100644 --- a/src/engine-eds.cpp +++ b/src/engine-eds.cpp @@ -33,8 +33,10 @@ namespace unity { namespace indicator { namespace datetime { -static constexpr char const * TAG_ALARM {"x-canonical-alarm"}; -static constexpr char const * TAG_DISABLED {"x-canonical-disabled"}; +static constexpr char const * TAG_ALARM {"x-canonical-alarm"}; +static constexpr char const * TAG_DISABLED {"x-canonical-disabled"}; + +static constexpr char const * X_PROP_APP_URL {"x-canonical-app-url"}; /**** ***** @@ -469,6 +471,24 @@ private: if (text.value) appointment.summary = text.value; + auto icc = e_cal_component_get_icalcomponent(component); // component owns icc + if (icc) + { + auto icalprop = icalcomponent_get_first_property(icc, ICAL_X_PROPERTY); + while (icalprop) + { + const char * x_name = icalproperty_get_x_name(icalprop); + if (!g_strcmp0(x_name, X_PROP_APP_URL)) + { + const char * url = icalproperty_get_value_as_string(icalprop); + if ((url != nullptr) && appointment.url.empty()) + appointment.url = url; + } + + icalprop = icalcomponent_get_next_property(icc, ICAL_X_PROPERTY); + } + } + appointment.begin = begin_dt; appointment.end = end_dt; appointment.color = subtask->color; -- cgit v1.2.3 From d5002c6b27cf0e00828555a10e89778008d6cd01 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 24 Mar 2015 14:28:23 -0500 Subject: make the string test case-insensitive --- src/engine-eds.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp index 8408a57..a47ab4a 100644 --- a/src/engine-eds.cpp +++ b/src/engine-eds.cpp @@ -33,10 +33,10 @@ namespace unity { namespace indicator { namespace datetime { -static constexpr char const * TAG_ALARM {"x-canonical-alarm"}; -static constexpr char const * TAG_DISABLED {"x-canonical-disabled"}; +static constexpr char const * TAG_ALARM {"x-canonical-alarm"}; +static constexpr char const * TAG_DISABLED {"x-canonical-disabled"}; -static constexpr char const * X_PROP_APP_URL {"x-canonical-app-url"}; +static constexpr char const * X_PROP_ACTIVATION_URL {"X-CANONICAL-ACTIVATION-URL"}; /**** ***** @@ -478,7 +478,7 @@ private: while (icalprop) { const char * x_name = icalproperty_get_x_name(icalprop); - if (!g_strcmp0(x_name, X_PROP_APP_URL)) + if ((x_name != nullptr) && !g_ascii_strcasecmp(x_name, X_PROP_ACTIVATION_URL)) { const char * url = icalproperty_get_value_as_string(icalprop); if ((url != nullptr) && appointment.url.empty()) -- cgit v1.2.3 From 3ab790edf3280f1a5ff9ecf6cc89175c967ee0d3 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 9 Apr 2015 13:20:25 -0500 Subject: resolve minor shear with trunk --- src/engine-eds.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp index b91fd71..e1424d7 100644 --- a/src/engine-eds.cpp +++ b/src/engine-eds.cpp @@ -542,6 +542,8 @@ private: auto icc = e_cal_component_get_icalcomponent(component); // component owns icc if (icc) { + g_debug("%s", icalcomponent_as_ical_string(icc)); // libical owns this string; no leak + auto icalprop = icalcomponent_get_first_property(icc, ICAL_X_PROPERTY); while (icalprop) { @@ -549,8 +551,8 @@ private: if ((x_name != nullptr) && !g_ascii_strcasecmp(x_name, X_PROP_ACTIVATION_URL)) { const char * url = icalproperty_get_value_as_string(icalprop); - if ((url != nullptr) && appointment.url.empty()) - appointment.url = url; + if ((url != nullptr) && appointment.activation_url.empty()) + appointment.activation_url = url; } icalprop = icalcomponent_get_next_property(icc, ICAL_X_PROPERTY); @@ -563,9 +565,6 @@ private: appointment.uid = uid; appointment.type = type; - icalcomponent * icc = e_cal_component_get_icalcomponent(component); - g_debug("%s", icalcomponent_as_ical_string(icc)); // libical owns this string; no leak - auto e_alarms = e_cal_util_generate_alarms_for_comp(component, subtask->begin, subtask->end, -- cgit v1.2.3 From a24c4f335c86c2d9bf97feb47471e6fe39e196d9 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 7 May 2015 19:10:37 -0500 Subject: in EngineEds' call to e_cal_util_generate_alarms_for_comp(), use nullptr as the default timezone so that we don't convert to local twice (once in _generate_alarms_for_comp, once in the DateTime ctor). Fixes the previous commit's failing test. --- src/engine-eds.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp index e1424d7..9c1f7c4 100644 --- a/src/engine-eds.cpp +++ b/src/engine-eds.cpp @@ -571,7 +571,7 @@ private: const_cast(omit.data()), e_cal_client_resolve_tzid_cb, subtask->client, - subtask->default_timezone); + nullptr); std::map alarms; -- cgit v1.2.3