Change notifications for calendar events s.t. the sound is nonrepeating and the notification is temporary, not requiring user interaction to disappear. Fixes: #1320880

Approved by: Ted Gould

1 files changed, 9 insertions, 4 deletions

diff --git a/src/snap.cpp b/src/snap.cpp
index 6d2957d..ee96007 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -63,13 +63,19 @@ public:
                     appointment_func snooze,
                     appointment_func ok)
     {
+        /* Alarms and calendar events are treated differently.
+           Alarms should require manual intervention to dismiss.
+           Calendar events are less urgent and shouldn't require manual
+           intervention and shouldn't loop the sound. */
+        const bool interactive = appointment.is_ubuntu_alarm() && m_engine->supports_actions();
+
         // force the system to stay awake
         auto awake = std::make_shared<uin::Awake>(m_engine->app_name());
 
         // create the sound...
         const auto uri = get_alarm_uri(appointment, m_settings);
         const auto volume = m_settings->alarm_volume.get();
-        const bool loop = m_engine->supports_actions();
+        const bool loop = interactive;
         auto sound = std::make_shared<uin::Sound>(uri, volume, loop);
 
         // create the haptic feedback...
@@ -80,12 +86,9 @@ public:
 
         // show a notification...
         const auto minutes = std::chrono::minutes(m_settings->alarm_duration.get());
-        const bool interactive = m_engine->supports_actions();
         uin::Builder b;
         b.set_body (appointment.summary);
         b.set_icon_name ("alarm-clock");
-        b.add_hint (uin::Builder::HINT_SNAP);
-        b.add_hint (uin::Builder::HINT_AFFIRMATIVE_HINT);
         b.add_hint (uin::Builder::HINT_NONSHAPED_ICON);
 
         const char * timefmt;
@@ -104,6 +107,8 @@ public:
         g_free (title);
         b.set_timeout (std::chrono::duration_cast<std::chrono::seconds>(minutes));
         if (interactive) {
+            b.add_hint (uin::Builder::HINT_SNAP);
+            b.add_hint (uin::Builder::HINT_AFFIRMATIVE_HINT);
             b.add_action ("ok", _("OK"));
             b.add_action ("snooze", _("Snooze"));
         }