From 14c515bd83b9773880f30f4748505ce4a3d5f1fe Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 15 Jan 2015 13:15:27 -0600
Subject: strengthen the test that decides if an icalcomponent is a one-shot or
 repeating.

---
 src/engine-eds.cpp | 7 +++++--
 tests/manual       | 6 ++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp
index 210ef42..47c7a9b 100644
--- a/src/engine-eds.cpp
+++ b/src/engine-eds.cpp
@@ -534,8 +534,11 @@ private:
         icalcomponent * icc = nullptr;
         if (e_cal_client_get_object_finish (E_CAL_CLIENT(client), result, &icc, nullptr))
         {
-            struct icaltimetype itt = icalcomponent_get_recurrenceid(icc);
-            if (icaltime_is_null_time(itt))
+            auto rrule_property = icalcomponent_get_first_property (icc, ICAL_RRULE_PROPERTY); // transfer none
+            auto rdate_property = icalcomponent_get_first_property (icc, ICAL_RDATE_PROPERTY); // transfer none
+            const bool is_nonrepeating = (rrule_property == nullptr) && (rdate_property == nullptr);
+
+            if (is_nonrepeating)
             {
                 g_debug("'%s' appears to be a one-time alarm... adding 'disabled' tag.",
                         icalcomponent_as_ical_string(icc));
diff --git a/tests/manual b/tests/manual
index 71d1e06..c283422 100644
--- a/tests/manual
+++ b/tests/manual
@@ -56,6 +56,12 @@ Test-case indicator-datetime/disable-one-time-alarms-after-notification
 		<dd>Confirm that the alarm notification is shown</dd>
 		<dd>Confirm that the alarm's sound is played while the alarm notification is present</dd>
 		<dd>Confirm that the one-time alarm is disabled after the notification is shown. NOTE: due to a refresh bug in clock-app you may need to refresh its alarms page (by swapping back to the main page, then the alarm page again, this is tracked in #1362341) in order to see the alarm change from enabled to disabled.</dd>
+	<dt>Create and save an upcoming repeating alarm in ubuntu-clock-app</dt>
+		<dd>Confirm that the alarm icon appears next to the current time in unity's indicator display</dd>
+	<dt>Wait until the alarm time is reached</dt>
+		<dd>Confirm that the alarm notification is shown</dd>
+		<dd>Confirm that the alarm's sound is played while the alarm notification is present</dd>
+		<dd>Confirm that the repeating alarm is not disabled after the notification is shown. NOTE: due to a refresh bug in clock-app you may need to refresh its alarms page (by swapping back to the main page, then the alarm page again, this is tracked in #1362341) in order to see the alarm change from enabled to disabled.</dd>
 </dl>
 
 Test-case indicator-datetime/calendar-event-notification
-- 
cgit v1.2.3


From 16fe6ab02517d420f3debcc83f626362ad962067 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Wed, 21 Jan 2015 23:53:14 -0600
Subject: bump to re-run CI. clumsy, but jenkins' rebuild button isn't working

---
 src/main.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main.cpp b/src/main.cpp
index 1761f84..85a414f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -46,6 +46,7 @@ namespace uin = unity::indicator::notifications;
 
 using namespace unity::indicator::datetime;
 
+
 namespace
 {
     std::shared_ptr<Engine> create_engine()
-- 
cgit v1.2.3