From c0f53270674c6dbfe2eadf38e999c2536c4af4e3 Mon Sep 17 00:00:00 2001
From: Arthur Mello <arthur.mello@canonical.com>
Date: Fri, 24 Jun 2016 09:26:06 -0300
Subject: Make sure that calendar settings do not affect alarm notifications

---
 src/snap.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/snap.cpp b/src/snap.cpp
index 1e71e7b..273f125 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -97,8 +97,8 @@ public:
 
         // force the system to stay awake
         std::shared_ptr<ain::Awake> awake;
-        if (calendar_bubbles_enabled()) {
-            awake = std::make_shared<uin::Awake>(m_engine->app_name());
+        if (appointment.is_ubuntu_alarm() || calendar_bubbles_enabled()) {
+            awake = std::make_shared<ain::Awake>(m_engine->app_name());
         }
 
         // calendar events are muted in silent mode; alarm clocks never are
@@ -114,7 +114,7 @@ public:
 
         // create the haptic feedback...
         std::shared_ptr<ain::Haptic> haptic;
-        if (should_vibrate() && calendar_vibrations_enabled()) {
+        if (should_vibrate() && (appointment.is_ubuntu_alarm() || calendar_vibrations_enabled())) {
             const auto haptic_mode = m_settings->alarm_haptic.get();
             if (haptic_mode == "pulse")
                 haptic = std::make_shared<ain::Haptic>(ain::Haptic::MODE_PULSE, appointment.is_ubuntu_alarm());
-- 
cgit v1.2.3