Merge lp:~donadigo/wingpanel-indicator-notifications/notification-open-app into lp:~elementary-pantheon/wingpanel-indicator-notifications/loki-rc

[Adam Bieńkowski]

* Fix bug #1594227: "Clicking a notification should open/focus the app".
* General code improvements.

Fixes bug #1594227: "Clicking a notification should open/focus the app".

This branch enables functionality to open / focus the app by clicking on the notification, if the notification has a default action, it will be launched instead of the app.

It also contains a large code improvements, simplifies the method names and makes it more easier to read.

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-05-27 15:10:53 +0000
+++ src/CMakeLists.txt	2016-06-20 18:57:25 +0000
@@ -20,7 +20,7 @@
   Widgets/NotificationEntry.vala
   Widgets/AppEntry.vala
   Widgets/SeparatorEntry.vala
-  Services/NotificationsMonitor.vala
+  Services/NotificationMonitor.vala
   Services/Notification.vala
   Services/NotifySettings.vala
   Services/Session.vala
 
=== modified file 'src/Services/Notification.vala'
--- src/Services/Notification.vala	2016-05-27 15:10:53 +0000
+++ src/Services/Notification.vala	2016-06-20 18:57:25 +0000
@@ -145,7 +145,7 @@
         }
 
         try {
-            IDBus? dbus_iface = Bus.get_proxy_sync (BusType.SESSION, "org.freedesktop.DBus", "/");
+            IDBus? dbus_iface = NotificationMonitor.get_dbus_iface ();
             if (dbus_iface != null && dbus_iface.name_has_owner (sender)) {
                 pid = dbus_iface.get_connection_unix_process_id (sender);
             }
@@ -157,9 +157,12 @@
     }
 
     public bool run_default_action () {
-        if (DEFAULT_ACTION in actions && NotificationMonitor.get_instance ().notifications_iface != null) {
-            NotificationMonitor.get_instance ().notifications_iface.action_invoked (DEFAULT_ACTION, id);
-            return true;
+        if (DEFAULT_ACTION in actions) {
+            INotifications? notifications_iface = NotificationMonitor.get_notifications_iface ();
+            if (notifications_iface != null) {
+                notifications_iface.action_invoked (DEFAULT_ACTION, id);
+                return true;
+            }
         }
 
         return false;
 
=== renamed file 'src/Services/NotificationsMonitor.vala' => 'src/Services/NotificationMonitor.vala'
--- src/Services/NotificationsMonitor.vala	2016-06-20 12:40:25 +0000
+++ src/Services/NotificationMonitor.vala	2016-06-20 18:57:25 +0000
@@ -23,14 +23,16 @@
 public class NotificationMonitor : Object {
     private const string NOTIFY_IFACE = "org.freedesktop.Notifications";
     private const string NOTIFY_PATH = "/org/freedesktop/Notifications";
+    private const string DBUS_IFACE = "org.freedesktop.DBus";
+    private const string DBUS_PATH = "/";
     private const string MATCH_STRING = "eavesdrop='true',type='method_call',interface='org.freedesktop.Notifications',member='Notify'";
     private const uint32 REASON_DISMISSED = 2;
 
     private static NotificationMonitor? instance = null;
+    private static INotifications? notifications_iface = null;
+    private static IDBus? dbus_iface = null;
 
     private DBusConnection connection;
-    public INotifications? notifications_iface = null;
-    public IDBus? dbus_iface = null;
     private uint32 id_counter = 0;
 
     public signal void received (DBusMessage message, uint32 id);
@@ -43,6 +45,30 @@
         return instance;
     }
 
+    public static INotifications? get_notifications_iface () {
+        if (notifications_iface == null) {
+            try {
+                notifications_iface = Bus.get_proxy_sync (BusType.SESSION, NOTIFY_IFACE, NOTIFY_PATH); 
+            } catch (Error e) {
+                warning ("%s\n", e.message);
+            }
+        }
+        
+        return notifications_iface;
+    }
+
+    public static IDBus? get_dbus_iface () {
+        if (dbus_iface == null) {
+            try {
+                dbus_iface = Bus.get_proxy_sync (BusType.SESSION, DBUS_IFACE, DBUS_PATH);
+            } catch (Error e) {
+                warning ("%s\n", e.message);
+            }            
+        }
+
+        return dbus_iface;
+    }
+
     private NotificationMonitor () {
         try {
             connection = Bus.get_sync (BusType.SESSION);
@@ -61,12 +87,6 @@
         var body = new Variant.parsed ("(%s,)", MATCH_STRING);
         message.set_body (body);
         
-        try {
-            notifications_iface = Bus.get_proxy_sync (BusType.SESSION, NOTIFY_IFACE, NOTIFY_PATH); 
-        } catch (Error e) {
-            error ("%s\n", e.message);
-        }
-
         id_counter = get_current_notification_id ();
         try {
             connection.send_message (message, DBusSendMessageFlags.NONE, null);
@@ -109,7 +129,7 @@
         hints.insert ("suppress-sound", new Variant.boolean (true));
         string[] actions = {};
         try {
-            return notifications_iface.notify ("", 0, "", "", "", actions, hints, 1);
+            return get_notifications_iface ().notify ("", 0, "", "", "", actions, hints, 1);
         } catch (Error e) {
             error ("%s\n", e.message);
         }
 
=== modified file 'src/Widgets/AppEntry.vala'
--- src/Widgets/AppEntry.vala	2016-05-27 15:10:53 +0000
+++ src/Widgets/AppEntry.vala	2016-06-20 18:57:25 +0000
@@ -89,6 +89,15 @@
         });
     }
 
+    public void update_app_window () {
+        if (app_notifications.length () == 0) {
+            return;
+        }
+
+        var notification_entry = app_notifications.nth_data (0);
+        app_window = notification_entry.get_app_window ();
+    }
+
     public unowned List<NotificationEntry> get_notifications () {
         return app_notifications;
     }
 
=== modified file 'src/Widgets/NotificationEntry.vala'
--- src/Widgets/NotificationEntry.vala	2016-05-27 15:10:53 +0000
+++ src/Widgets/NotificationEntry.vala	2016-06-20 18:57:25 +0000
@@ -61,6 +61,18 @@
         }
     }
 
+    public Wnck.Window? get_app_window () {
+        Wnck.Window? window = null;
+        Wnck.Screen.get_default ().get_windows ().@foreach ((_window) => {
+            if (_window.get_pid () == notification.pid) {
+                window = _window;
+                return;
+            }
+        });
+
+        return window;        
+    }
+
     private void add_widgets () {
         var grid = new Gtk.Grid ();
         grid.margin_start = 40;
 
=== modified file 'src/Widgets/NotificationsList.vala'
--- src/Widgets/NotificationsList.vala	2016-06-20 12:37:34 +0000
+++ src/Widgets/NotificationsList.vala	2016-06-20 18:57:25 +0000
@@ -49,7 +49,7 @@
         switch_stack (true);
 
         app_entry.add_notification_entry (entry);
-        resort_from_app_entry (app_entry);
+        resort_app_entry (app_entry);
 
         entry.clear.connect (() => {
             destroy_notification_entry (entry);
@@ -59,7 +59,7 @@
             destroy_app_entry (app_entry);
         });
 
-        counter = counter + 2;
+        counter += 2;
 
         Session.get_instance ().add_notification (entry.notification);
         entry.show_all ();
@@ -116,7 +116,7 @@
         AppEntry app_entry;
         bool add = !(entry.notification.app_name in construct_app_names ());
         if (add) {
-            var window = get_window_from_entry (entry);
+            var window = entry.get_app_window ();
             app_entry = new AppEntry (entry, window);
 
             screen.active_window_changed.connect (() => {
@@ -130,7 +130,7 @@
             insert (entry, 1);
             table.insert (app_entry.app_name, 0);
         } else {
-            app_entry = get_app_entry_from_app_name (entry.notification.app_name);
+            app_entry = get_from_app_name (entry.notification.app_name);
             if (app_entry != null) {
                 int insert_pos = table.@get (app_entry.app_name);
                 insert (entry, insert_pos + 1);                
@@ -140,18 +140,6 @@
         return app_entry;
     }
 
-    private Wnck.Window? get_window_from_entry (NotificationEntry entry) {
-        Wnck.Window? window = null;
-        screen.get_windows ().@foreach ((_window) => {
-            if (_window.get_pid () == entry.notification.pid) {
-                window = _window;
-                return;
-            }
-        });
-
-        return window;
-    }
-
     private async void destroy_notification_entry (NotificationEntry entry) {
         entry.destroy ();
         items.remove (entry);
@@ -186,7 +174,7 @@
         update_separators ();
     }
 
-    private void resort_from_app_entry (AppEntry app_entry) {
+    private void resort_app_entry (AppEntry app_entry) {
         if (get_row_at_index (0) != app_entry) {
             remove (app_entry);
             prepend (app_entry);
@@ -199,7 +187,7 @@
         }
     }
 
-    private AppEntry? get_app_entry_from_app_name (string app_name) {
+    private AppEntry? get_from_app_name (string app_name) {
         AppEntry? entry = null;
         app_entries.@foreach ((_entry) => {
             if (_entry.app_name == app_name) {
@@ -221,37 +209,41 @@
     }
 
     private void on_row_activated (Gtk.ListBoxRow row) {
-        if (row.get_path ().get_object_type () == typeof (AppEntry)) {
-            if (((AppEntry) row).app_window == null) {
-                var window = get_window_from_entry (((AppEntry) row).get_notifications ().nth_data (0));
-                if (window != null) {
-                    ((AppEntry) row).app_window = window;
-                }
-            }
-
-            if (((AppEntry) row).app_window != null) {
-                ((AppEntry) row).app_window.unminimize (Gtk.get_current_event_time ());
-                ((AppEntry) row).clear_btn_entry.clicked ();
-                close_popover ();
-            } else if (((AppEntry) row).appinfo != null) {
-                try {
-                    ((AppEntry) row).appinfo.launch (null, null);
-                } catch (Error e) {
-                    error ("%s\n", e.message);
-                }
-
-                ((AppEntry) row).clear_btn_entry.clicked ();
-                close_popover ();
-            }
-        } else {
-            if (((NotificationEntry) row).notification.run_default_action ()) {
-                ((NotificationEntry) row).active = false;
-                close_popover ();
-            }
-
-            ((NotificationEntry) row).clear ();
+        if (row is AppEntry) {
+            var app_entry = (AppEntry)row;
+            if (app_entry.app_window == null) {
+                app_entry.update_app_window ();
+            }
+
+            focus_notification_app (app_entry.app_window,
+                                    app_entry.appinfo);
+
+            app_entry.clear_btn_entry.clicked ();
+            close_popover ();
+        } else if (row is NotificationEntry) {
+            var notification_entry = (NotificationEntry)row;
+            if (!notification_entry.notification.run_default_action ()) {
+                focus_notification_app (notification_entry.get_app_window (),
+                                        notification_entry.notification.appinfo);
+            }
+            
+            notification_entry.clear ();
+            notification_entry.active = false;
+            close_popover ();            
         }
 
         update_separators ();
     }
+
+    private void focus_notification_app (Wnck.Window? app_window, AppInfo? appinfo) {
+        if (app_window != null) {
+            app_window.unminimize (Gtk.get_current_event_time ());
+        } else if (appinfo != null) {
+            try {
+                appinfo.launch (null, null);
+            } catch (Error e) {
+                warning ("%s\n", e.message);
+            }
+        }
+    }
 }