From 95bc85d108e3564d98f26b7ad17fcc72b2966371 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sun, 7 Dec 2014 20:38:44 -0600 Subject: ensure that disabled alarms aren't shown in indicator-datetime and that notifications aren't shown for them. --- src/menu.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/menu.cpp') diff --git a/src/menu.cpp b/src/menu.cpp index 6dcac27..f11de77 100644 --- a/src/menu.cpp +++ b/src/menu.cpp @@ -316,7 +316,7 @@ private: g_menu_item_set_attribute (menu_item, "x-canonical-time", "x", unix_time); g_menu_item_set_attribute (menu_item, "x-canonical-time-format", "s", fmt.c_str()); - if (appt.has_alarms) + if (appt.is_ubuntu_alarm()) { g_menu_item_set_attribute (menu_item, "x-canonical-type", "s", "com.canonical.indicator.alarm"); g_menu_item_set_attribute_value(menu_item, G_MENU_ATTRIBUTE_ICON, get_serialized_alarm_icon()); @@ -509,16 +509,16 @@ protected: GVariant* create_header_state() { // are there alarms? - bool has_alarms = false; + bool has_ubuntu_alarms = false; for(const auto& appointment : m_upcoming) - if((has_alarms = appointment.has_alarms)) + if((has_ubuntu_alarms = appointment.is_ubuntu_alarm())) break; GVariantBuilder b; g_variant_builder_init(&b, G_VARIANT_TYPE_VARDICT); g_variant_builder_add(&b, "{sv}", "title", g_variant_new_string (_("Time & Date"))); g_variant_builder_add(&b, "{sv}", "visible", g_variant_new_boolean (TRUE)); - if (has_alarms) + if (has_ubuntu_alarms) { auto label = m_formatter->header.get(); auto a11y = g_strdup_printf(_("%s (has alarms)"), label.c_str()); -- cgit v1.2.3