From 99bd6787eb3d099f196f8e696be23a6dbac82909 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Thu, 28 Oct 2021 06:48:17 +0200 Subject: Remove the activation_url from the Appointment class --- src/actions-live.cpp | 7 +------ src/engine-eds.cpp | 16 +--------------- 2 files changed, 2 insertions(+), 21 deletions(-) (limited to 'src') diff --git a/src/actions-live.cpp b/src/actions-live.cpp index 81bdb70..b2de976 100644 --- a/src/actions-live.cpp +++ b/src/actions-live.cpp @@ -150,12 +150,7 @@ std::string LiveActions::open_appointment(const Appointment& appt, const DateTim { std::string sReturn = ""; - if (!appt.activation_url.empty()) - { - sReturn = appt.activation_url; - ayatana_common_utils_open_url(sReturn.c_str()); - } - else switch (appt.type) + switch (appt.type) { case Appointment::ALARM: sReturn = open_alarm_app(); diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp index b0a1a0d..54fafc0 100644 --- a/src/engine-eds.cpp +++ b/src/engine-eds.cpp @@ -40,8 +40,6 @@ namespace datetime { static constexpr char const * TAG_ALARM {"x-ayatana-alarm"}; static constexpr char const * TAG_DISABLED {"x-ayatana-disabled"}; -static constexpr char const * X_PROP_ACTIVATION_URL {"X-CANONICAL-ACTIVATION-URL"}; - /**** ***** ****/ @@ -1062,21 +1060,9 @@ private: } g_clear_pointer (&eccdt_tmp, e_cal_component_datetime_free); - // get appointment.activation_url from x-props - auto icc = e_cal_component_get_icalcomponent(component); // icc owned by component - auto icalprop = i_cal_component_get_first_property(icc, I_CAL_X_PROPERTY); - while (icalprop != nullptr) { - const char * x_name = i_cal_property_get_x_name(icalprop); - if ((x_name != nullptr) && !g_ascii_strcasecmp(x_name, X_PROP_ACTIVATION_URL)) { - const char * url = i_cal_property_get_value_as_string(icalprop); - if ((url != nullptr) && baseline.activation_url.empty()) - baseline.activation_url = url; - } - icalprop = i_cal_component_get_next_property(icc, I_CAL_X_PROPERTY); - } - // get appointment.type baseline.type = Appointment::EVENT; + auto icc = e_cal_component_get_icalcomponent(component); // icc owned by component auto categ_list = e_cal_component_get_categories_list (component); for (GSList * l=categ_list; l!=nullptr; l=l->next) { auto tag = static_cast(l->data); -- cgit v1.2.3