diff options
author | Charles Kerr <charles.kerr@canonical.com> | 2015-04-09 13:20:25 -0500 |
---|---|---|
committer | Charles Kerr <charles.kerr@canonical.com> | 2015-04-09 13:20:25 -0500 |
commit | 3ab790edf3280f1a5ff9ecf6cc89175c967ee0d3 (patch) | |
tree | d7cda9884906161dc4869fb7af33e5d14a8641cf /src | |
parent | 8d282df37c72ff27a006ff928f1b151d98aa0e45 (diff) | |
download | ayatana-indicator-datetime-3ab790edf3280f1a5ff9ecf6cc89175c967ee0d3.tar.gz ayatana-indicator-datetime-3ab790edf3280f1a5ff9ecf6cc89175c967ee0d3.tar.bz2 ayatana-indicator-datetime-3ab790edf3280f1a5ff9ecf6cc89175c967ee0d3.zip |
resolve minor shear with trunk
Diffstat (limited to 'src')
-rw-r--r-- | src/engine-eds.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
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, |