Merge lp:~donadigo/wingpanel-indicator-notifications/fix-1649406-not-close-withdrawal into lp:~wingpanel-devs/wingpanel-indicator-notifications/wingpanel-indicator-notifications

[Adam Bieńkowski]

* Fix popover closing when withdrawal happens

This branch fixes bug #1649406: "Do not close if currently opened".

When the notification is requested a withdrawal, do not close the popover as it's not a user action, other actions such as "clearing all", or closing the popover by the user are allowed.

Unmerged revisions

132. By Adam Bieńkowski on 2017-01-01

Disallow closing popover from NotificationsList when withdrawal happens

=== modified file 'src/Indicator.vala'
--- src/Indicator.vala	2016-12-12 18:59:44 +0000
+++ src/Indicator.vala	2017-01-01 16:43:18 +0000
@@ -34,6 +34,7 @@
     private NotificationsList nlist;
 
     private Gee.HashMap<string, Settings> app_settings_cache;
+    private bool is_withdrawing = false;
 
     public Indicator () {
         Object (code_name: Wingpanel.Indicator.MESSAGES,
@@ -100,7 +101,14 @@
             var settings_btn = new Wingpanel.Widgets.Button (_("Notifications Settings…"));
             settings_btn.clicked.connect (show_settings);
 
-            nlist.close_popover.connect (() => close ());
+            nlist.close_popover.connect (() => {
+                if (is_withdrawing) {
+                    return;
+                }
+                
+                close ();
+            });
+
             nlist.switch_stack.connect (on_switch_stack);
 
             var monitor = NotificationMonitor.get_instance ();
@@ -178,7 +186,9 @@
         foreach (var app_entry in nlist.get_entries ()) {
             foreach (var item in app_entry.app_notifications) {
                 if (item.notification.id == id) {
+                    is_withdrawing = true;
                     item.notification.close ();
+                    is_withdrawing = false;
                     return;
                 }
             }