Merge lp:~artmello/indicator-datetime/indicator-datetime-remove_notification_list_check into lp:indicator-datetime

[Arthur Mello]

Do not check if calendar can use Notification list
Always display calendar notification to Notification List if notifications are enabled for calendar-app

Do not check if calendar can use Notification list
Always display calendar notification to Notification List if notifications are enabled for calendar-app

Unmerged revisions

460. By Arthur Mello on 2016-07-26

Do not check if calendar can use Notification list
Always display calendar notification to Notification List if notifications are enabled for calendar-app

=== modified file 'include/datetime/settings-live.h'
--- include/datetime/settings-live.h	2016-07-04 19:30:18 +0000
+++ include/datetime/settings-live.h	2016-07-26 20:32:13 +0000
@@ -69,7 +69,6 @@
     void update_cal_notification_sounds();
     void update_cal_notification_vibrations();
     void update_cal_notification_bubbles();
-    void update_cal_notification_list();
     void update_vibrate_silent_mode();
 
     GSettings* m_settings;
 
=== modified file 'include/datetime/settings-shared.h'
--- include/datetime/settings-shared.h	2016-07-04 19:30:18 +0000
+++ include/datetime/settings-shared.h	2016-07-26 20:32:13 +0000
@@ -60,6 +60,5 @@
 #define SETTINGS_NOTIFY_SOUNDS_KEY      "use-sounds-notifications"
 #define SETTINGS_NOTIFY_VIBRATIONS_KEY  "use-vibrations-notifications"
 #define SETTINGS_NOTIFY_BUBBLES_KEY     "use-bubbles-notifications"
-#define SETTINGS_NOTIFY_LIST_KEY        "use-list-notifications"
 
 #endif // INDICATOR_DATETIME_SETTINGS_SHARED
 
=== modified file 'include/datetime/settings.h'
--- include/datetime/settings.h	2016-07-04 19:30:18 +0000
+++ include/datetime/settings.h	2016-07-26 20:32:13 +0000
@@ -66,7 +66,6 @@
     core::Property<bool> cal_notification_sounds;
     core::Property<bool> cal_notification_vibrations;
     core::Property<bool> cal_notification_bubbles;
-    core::Property<bool> cal_notification_list;
     core::Property<bool> vibrate_silent_mode;
 };
 
 
=== modified file 'include/notifications/notifications.h'
--- include/notifications/notifications.h	2016-06-30 00:37:56 +0000
+++ include/notifications/notifications.h	2016-07-26 20:32:13 +0000
@@ -80,9 +80,6 @@
     /** Sets if a notification bubble should be displayed. */
     void set_show_notification_bubble (bool show);
 
-    /** Sets if notification should be posted to messaging menu after it is closed. */
-    void set_post_to_messaging_menu (bool post);
-
 
 private:
     friend class Engine;
 
=== modified file 'src/notifications.cpp'
--- src/notifications.cpp	2016-06-30 00:37:56 +0000
+++ src/notifications.cpp	2016-07-26 20:32:13 +0000
@@ -62,7 +62,6 @@
     std::function<void(const std::string&)> m_closed_callback;
     std::function<void()> m_timeout_callback;
     bool m_show_notification_bubble;
-    bool m_post_to_messaging_menu;
 };
 
 Builder::Builder():
@@ -134,12 +133,6 @@
   impl->m_show_notification_bubble = show;
 }
 
-void
-Builder::set_post_to_messaging_menu (bool post)
-{
-  impl->m_post_to_messaging_menu = post;
-}
-
 /***
 ****
 ***/
@@ -301,10 +294,6 @@
 
     std::string post(const Builder::Impl& data)
     {
-        if (!data.m_post_to_messaging_menu) {
-            return "";
-        }
-
         if (!m_messaging_app) {
             return std::string();
         }
 
=== modified file 'src/settings-live.cpp'
--- src/settings-live.cpp	2016-07-04 19:30:18 +0000
+++ src/settings-live.cpp	2016-07-26 20:32:13 +0000
@@ -69,7 +69,6 @@
     update_cal_notification_sounds();
     update_cal_notification_vibrations();
     update_cal_notification_bubbles();
-    update_cal_notification_list();
     update_vibrate_silent_mode();
 
     // now listen for clients to change the properties s.t. we can sync update GSettings
@@ -175,10 +174,6 @@
         g_settings_set_boolean(m_settings_cal_notification, SETTINGS_NOTIFY_BUBBLES_KEY, value);
     });
 
-    cal_notification_list.changed().connect([this](bool value){
-        g_settings_set_boolean(m_settings_cal_notification, SETTINGS_NOTIFY_LIST_KEY, value);
-    });
-
     vibrate_silent_mode.changed().connect([this](bool value){
         g_settings_set_boolean(m_settings_general_notification, SETTINGS_VIBRATE_SILENT_KEY, value);
     });
@@ -328,11 +323,6 @@
     cal_notification_bubbles.set(g_settings_get_boolean(m_settings_cal_notification, SETTINGS_NOTIFY_BUBBLES_KEY));
 }
 
-void LiveSettings::update_cal_notification_list()
-{
-    cal_notification_list.set(g_settings_get_boolean(m_settings_cal_notification, SETTINGS_NOTIFY_LIST_KEY));
-}
-
 void LiveSettings::update_vibrate_silent_mode()
 {
     vibrate_silent_mode.set(g_settings_get_boolean(m_settings_general_notification, SETTINGS_VIBRATE_SILENT_KEY));
@@ -360,8 +350,6 @@
         update_cal_notification_vibrations();
     else if (key == SETTINGS_NOTIFY_BUBBLES_KEY)
         update_cal_notification_bubbles();
-    else if (key == SETTINGS_NOTIFY_LIST_KEY)
-        update_cal_notification_list();
 }
 
 /***
 
=== modified file 'src/snap.cpp'
--- src/snap.cpp	2016-07-04 23:44:47 +0000
+++ src/snap.cpp	2016-07-26 20:32:13 +0000
@@ -97,10 +97,7 @@
         const bool interactive = appointment.is_ubuntu_alarm() && m_engine->supports_actions();
 
         // force the system to stay awake
-        std::shared_ptr<uin::Awake> awake;
-        if (appointment.is_ubuntu_alarm() || calendar_bubbles_enabled() || calendar_list_enabled()) {
-            awake = std::make_shared<uin::Awake>(m_engine->app_name());
-        }
+        std::shared_ptr<uin::Awake> awake = std::make_shared<uin::Awake>(m_engine->app_name());
 
         // calendar events are muted in silent mode; alarm clocks never are
         std::shared_ptr<uin::Sound> sound;
@@ -185,7 +182,6 @@
         }
 
         b.set_show_notification_bubble(appointment.is_ubuntu_alarm() || calendar_bubbles_enabled());
-        b.set_post_to_messaging_menu(appointment.is_ubuntu_alarm() || calendar_list_enabled());
 
         const auto key = m_engine->show(b);
         if (key)
@@ -214,11 +210,6 @@
         return m_settings->cal_notification_bubbles.get();
     }
 
-    bool calendar_list_enabled() const
-    {
-        return m_settings->cal_notification_list.get();
-    }
-
     bool vibrate_in_silent_mode_enabled() const
     {
         return m_settings->vibrate_silent_mode.get();
 
=== modified file 'tests/test-notification.cpp'
--- tests/test-notification.cpp	2016-06-24 12:26:06 +0000
+++ tests/test-notification.cpp	2016-07-26 20:32:13 +0000
@@ -122,7 +122,6 @@
     settings->cal_notification_sounds.set(test_disabled.cal_notification_enabled);
     settings->cal_notification_vibrations.set(test_disabled.cal_notification_enabled);
     settings->cal_notification_bubbles.set(test_disabled.cal_notification_enabled);
-    settings->cal_notification_list.set(test_disabled.cal_notification_enabled);
 
     // set test case properties: haptic mode
     settings->alarm_haptic.set(test_haptic.haptic_mode);
@@ -234,7 +233,6 @@
   settings->cal_notification_sounds.set(true);
   settings->cal_notification_vibrations.set(true);
   settings->cal_notification_bubbles.set(true);
-  settings->cal_notification_list.set(true);
 
   // walk through the tests
   for (const auto& test : tests)
 
=== modified file 'tests/test-settings.cpp'
--- tests/test-settings.cpp	2016-07-01 19:46:40 +0000
+++ tests/test-settings.cpp	2016-07-26 20:32:13 +0000
@@ -237,5 +237,4 @@
     TestBoolProperty(m_gsettings_cal_notification, m_settings->cal_notification_sounds, SETTINGS_NOTIFY_SOUNDS_KEY);
     TestBoolProperty(m_gsettings_cal_notification, m_settings->cal_notification_vibrations, SETTINGS_NOTIFY_VIBRATIONS_KEY);
     TestBoolProperty(m_gsettings_cal_notification, m_settings->cal_notification_bubbles, SETTINGS_NOTIFY_BUBBLES_KEY);
-    TestBoolProperty(m_gsettings_cal_notification, m_settings->cal_notification_list, SETTINGS_NOTIFY_LIST_KEY);
 }
 
=== modified file 'tests/test-sound.cpp'
--- tests/test-sound.cpp	2016-06-23 19:04:50 +0000
+++ tests/test-sound.cpp	2016-07-26 20:32:13 +0000
@@ -63,7 +63,6 @@
   settings->cal_notification_sounds.set(true);
   settings->cal_notification_vibrations.set(true);
   settings->cal_notification_bubbles.set(true);
-  settings->cal_notification_list.set(true);
 
   make_interactive();
 
@@ -160,7 +159,6 @@
   settings->cal_notification_sounds.set(true);
   settings->cal_notification_vibrations.set(true);
   settings->cal_notification_bubbles.set(true);
-  settings->cal_notification_list.set(true);
 
   const struct {
       Appointment appointment;