diff options
author | Charles Kerr <charles.kerr@canonical.com> | 2014-12-08 23:08:41 +0000 |
---|---|---|
committer | CI Train Bot <ci-train-bot@canonical.com> | 2014-12-08 23:08:41 +0000 |
commit | 13688fe9fffc1d9dad3bf5918efcc8221846c82b (patch) | |
tree | e6c54b125ac8689581d32678163c57514e8a0c96 /tests/test-menus.cpp | |
parent | 5186d1c20416dd4726de863b638a49b885ef7b9a (diff) | |
parent | 95bc85d108e3564d98f26b7ad17fcc72b2966371 (diff) | |
download | ayatana-indicator-datetime-13688fe9fffc1d9dad3bf5918efcc8221846c82b.tar.gz ayatana-indicator-datetime-13688fe9fffc1d9dad3bf5918efcc8221846c82b.tar.bz2 ayatana-indicator-datetime-13688fe9fffc1d9dad3bf5918efcc8221846c82b.zip |
Add support for x-canonical-alarm and x-canonical-disabled tags in VTODO categories so that disabled alarms will not be displayed. Fixes: #1387231
Approved by: Ted Gould, PS Jenkins bot
Diffstat (limited to 'tests/test-menus.cpp')
-rw-r--r-- | tests/test-menus.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/test-menus.cpp b/tests/test-menus.cpp index 363a132..e0e63ac 100644 --- a/tests/test-menus.cpp +++ b/tests/test-menus.cpp @@ -191,7 +191,7 @@ private: a1.summary = "Alarm"; a1.summary = "http://www.example.com/"; a1.uid = "example"; - a1.has_alarms = true; + a1.type = Appointment::UBUNTU_ALARM; a1.begin = a1.end = tomorrow; Appointment a2; // a non-alarm appointment @@ -199,7 +199,7 @@ private: a2.summary = "Other Text"; a2.summary = "http://www.monkey.com/"; a2.uid = "monkey"; - a2.has_alarms = false; + a1.type = Appointment::EVENT; a2.begin = a2.end = tomorrow; return std::vector<Appointment>({a1, a2}); @@ -212,7 +212,7 @@ private: // confirm it has the right x-canonical-type gchar * str = nullptr; g_menu_model_get_item_attribute(section, index, "x-canonical-type", "s", &str); - if (appt.has_alarms) + if (appt.is_ubuntu_alarm()) EXPECT_STREQ("com.canonical.indicator.alarm", str); else EXPECT_STREQ("com.canonical.indicator.appointment", str); @@ -245,7 +245,7 @@ private: g_clear_pointer(&str, g_free); // confirm that alarms have an icon - if (appt.has_alarms) + if (appt.is_ubuntu_alarm()) { auto v = g_menu_model_get_item_attribute_value(section, index, |