Merge lp:~donadigo/wingpanel-indicator-notifications/display-all into lp:~wingpanel-devs/wingpanel-indicator-notifications/wingpanel-indicator-notifications

[Adam Bieńkowski]

* Fix bug #1594062: "Display all notifications instead of catching closed ones".
* Fixed a warning with removing widget from container.

Fixes bug #1594062: "Display all notifications instead of catching closed ones".

Remove catching closed notifications logic, now they'll be available immediately after the server call. Also fixed a warning with removing widget from container.

=== modified file 'src/Services/NotificationsMonitor.vala'
--- src/Services/NotificationsMonitor.vala	2016-05-27 15:10:53 +0000
+++ src/Services/NotificationsMonitor.vala	2016-06-20 12:44:19 +0000
@@ -90,24 +90,13 @@
                     current_id = id_counter;
                 }
 
-                if (NotifySettings.get_instance ().do_not_disturb) {
+                Idle.add (() => {
                     this.received (message, current_id);
-                } else {
-                    notifications_iface.notification_closed.connect ((id, reason) => {
-                        if (id == 1) {
-                            id_counter = id;
-                            current_id = id_counter;
-                        }
-
-                        if (reason != REASON_DISMISSED && current_id == id) {
-                            this.received (message, id);
-                            message = null;
-                        }
-                    });
-                }
+                    message = null;
+                    return false;
+                });
 
                 return null;
-
             }
         }
 

=== modified file 'src/Widgets/NotificationsList.vala'
--- src/Widgets/NotificationsList.vala	2016-05-27 15:10:53 +0000
+++ src/Widgets/NotificationsList.vala	2016-06-20 12:44:19 +0000
@@ -167,7 +167,7 @@
         app_entries.remove (app_entry);
 
         app_entry.get_notifications ().@foreach ((notification_entry) => {
-            remove (notification_entry);
+            notification_entry.destroy ();
             items.remove (notification_entry);
         });