Merge lp:~donadigo/wingpanel-indicator-notifications/gala-changes-update into lp:~wingpanel-devs/wingpanel-indicator-notifications/wingpanel-indicator-notifications

[Adam Bieńkowski]

- Update backend to fit newest gala changes

This branch adjusts the code to fit the newest gala changes made by Felipe. There are also minor changes like improving code logic and added header to Utils.vala file.

Keep in mind that for this branch to work you will need the latest gala from trunk installed.

[lp:~donadigo/wingpanel-indicator-notifications/gala-changes-update]

104. By Adam Bieńkowski on 2016-07-17

Find app entries by their desktop id, not by app name

105. By Adam Bieńkowski on 2016-07-17

If does not have UsesNotifications key, use notifications from fallback

106. By Adam Bieńkowski on 2016-07-18

Set desktop_id when found AppInfo from name

[Felipe Escoto (philip.scott)]

Working and looking good!

review: Approve

=== modified file 'src/Indicator.vala'
--- src/Indicator.vala	2016-05-27 15:10:53 +0000
+++ src/Indicator.vala	2016-07-18 15:43:26 +0000
@@ -43,6 +43,7 @@
         visible = true;
 
         app_settings_cache = new Gee.HashMap<string, Settings> ();
+        Utils.init ();
     }
 
     public override Gtk.Widget get_display_widget () {
@@ -135,26 +136,24 @@
 
     private void on_notification_received (DBusMessage message, uint32 id) {
         var notification = new Notification.from_message (message, id);
-        string app_name = notification.app_name;
-
-        if (!notification.get_is_valid () || app_name in EXCEPTIONS) {
+        if (!notification.get_is_valid () || notification.app_name in EXCEPTIONS) {
             return;
         }
 
-        Settings? app_settings = app_settings_cache.get (app_name);
+        string app_id = notification.desktop_id.replace (Notification.DESKTOP_ID_EXT, "");
+        if (!((DesktopAppInfo)notification.app_info).get_boolean ("X-GNOME-UsesNotifications")) {
+            app_id = "gala-other";
+        }
+
+        Settings? app_settings = app_settings_cache.get (app_id);
 
         var schema = SettingsSchemaSource.get_default ().lookup (CHILD_SCHEMA_ID, true);
-        string appid = "";
-        if (notification.appinfo != null) {
-            appid = notification.appinfo.get_id ().replace (Notification.DESKTOP_ID_EXT, "");
-        }
-
-        if (schema != null && app_settings == null && appid != "") {
-            app_settings = new Settings.full (schema, null, CHILD_PATH.printf (appid));
-            app_settings_cache.set (appid, app_settings);
-        }
-
-        if (app_settings == null || (app_settings != null && app_settings.get_boolean (REMEMBER_KEY))) {
+        if (schema != null && app_settings == null && app_id != "") {
+            app_settings = new Settings.full (schema, null, CHILD_PATH.printf (app_id));
+            app_settings_cache.set (app_id, app_settings);
+        }
+
+        if (app_settings == null || app_settings.get_boolean (REMEMBER_KEY)) {
             var entry = new NotificationEntry (notification);
             nlist.add_item (entry);
         }
@@ -177,10 +176,8 @@
         var previous_session = Session.get_instance ().get_session_notifications ();
         if (previous_session.length () > 0) {
             previous_session.@foreach ((notification) => {
-                if (notification.message_body.strip () != "" && notification.summary.strip () != "") {
-                    var entry = new NotificationEntry (notification);
-                    nlist.add_item (entry);                     
-                }
+                var entry = new NotificationEntry (notification);
+                nlist.add_item (entry);                     
             });
         }        
     }

=== modified file 'src/Services/Notification.vala'
--- src/Services/Notification.vala	2016-05-27 15:10:53 +0000
+++ src/Services/Notification.vala	2016-07-18 15:43:26 +0000
@@ -16,6 +16,8 @@
  */
 
 public class Notification : Object {
+    public static const string DESKTOP_ID_EXT = ".desktop";
+
     public bool data_session;
 
     public string app_name;
@@ -34,7 +36,7 @@
     public int64 unix_time;
 
     public string desktop_id;
-    public AppInfo? appinfo = null;
+    public AppInfo? app_info = null;
 
     public signal bool time_changed (TimeSpan span);
 
@@ -50,10 +52,9 @@
         COUNT
     }
 
-    public static const string DESKTOP_ID_EXT = ".desktop";
     private const string DEFAULT_ACTION = "default";
     private const string DESKTOP_ENTRY_KEY = "desktop-entry";
-    private const string[] OTHER_WHITELIST = { "notify-send" };
+    private const string FALLBACK_DESKTOP_ID = "gala-other" + DESKTOP_ID_EXT;
     private bool pid_accuired;
 
     public Notification.from_message (DBusMessage message, uint32 _id) {
@@ -76,17 +77,24 @@
         timestamp = new DateTime.now_local ();
         unix_time = timestamp.to_unix ();
 
-        desktop_id = lookup_string (hints, DESKTOP_ENTRY_KEY);
+        app_info = Utils.get_appinfo_from_app_name (app_name);
+        if (app_info != null) {
+            desktop_id = app_info.get_id ();
+        } else {
+            desktop_id = lookup_string (hints, DESKTOP_ENTRY_KEY);
+        }
+        
         if (desktop_id != "" && !desktop_id.has_suffix (DESKTOP_ID_EXT)) {
             desktop_id += DESKTOP_ID_EXT;
-        }
-
-        appinfo = Utils.get_appinfo_from_app_name (app_name);
-        if (desktop_id != "" && appinfo == null) {
-            appinfo = new DesktopAppInfo (desktop_id);
-        }
-
-        set_properties ();
+
+            app_info = new DesktopAppInfo (desktop_id);
+        }
+
+        if (app_info == null) {
+            desktop_id = FALLBACK_DESKTOP_ID;
+            app_info = new DesktopAppInfo (desktop_id);
+        }
+
         setup_pid ();
 
         Timeout.add_seconds_full (Priority.DEFAULT, 60, source_func);
@@ -107,7 +115,8 @@
         id = _id;
         sender = _sender;
 
-        set_properties ();
+        app_info = Utils.get_appinfo_from_app_name (app_name);
+
         setup_pid ();
 
         actions = _actions;
@@ -120,14 +129,7 @@
     }
 
     public bool get_is_valid () {
-        return app_name in OTHER_WHITELIST || appinfo != null;
-    }
-
-    private void set_properties () {
-        if (app_name in OTHER_WHITELIST) {
-            display_name = _("Other");
-            app_icon = "dialog-information";            
-        }
+        return app_info != null;
     }
 
     private void setup_pid () {

=== modified file 'src/Services/Session.vala'
--- src/Services/Session.vala	2016-05-27 15:10:53 +0000
+++ src/Services/Session.vala	2016-07-18 15:43:26 +0000
@@ -22,7 +22,7 @@
  *
  */
 public class Session : GLib.Object {
-    private const string SESSION_NAME_FILE = "/.notifications.session";
+    private const string SESSION_FILE_NAME = ".notifications.session";
     private static Session? instance = null;
 
     private static File? session_file = null;
@@ -47,7 +47,7 @@
     }
 
     private Session () {
-        full_path = Environment.get_user_cache_dir () + SESSION_NAME_FILE;
+        full_path = Path.build_filename (Environment.get_user_cache_dir (), SESSION_FILE_NAME);
         session_file = File.new_for_path (full_path);
         if (!session_file.query_exists ())
             create_session_file ();

=== modified file 'src/Utils.vala'
--- src/Utils.vala	2016-05-26 19:00:36 +0000
+++ src/Utils.vala	2016-07-18 15:43:26 +0000
@@ -1,51 +1,76 @@
+/*-
+ * Copyright (c) 2016 Wingpanel Developers (http://launchpad.net/wingpanel)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Library General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 public class Utils : Object {
+    private static Gee.HashMap<string, AppInfo> app_info_cache;
+
+    public static void init () {
+        app_info_cache = new Gee.HashMap<string, AppInfo> ();
+    }
+
     public static AppInfo? get_appinfo_from_app_name (string app_name) {
         if (app_name.strip () == "") {
             return null;
         }
 
-        AppInfo? appinfo = null;
-        AppInfo.get_all ().@foreach ((_appinfo) => {
-            if (_appinfo != null && validate (_appinfo, app_name)) {
-                appinfo = _appinfo;
-                return;
+        AppInfo? app_info = app_info_cache.get (app_name);
+        foreach (unowned AppInfo info in AppInfo.get_all ()) {
+            if (info == null || !validate (info, app_name)) {
+                continue;
             }
-        });
-
-        return appinfo;
+
+            app_info = info;
+            break;
+        }
+
+        app_info_cache.set (app_name, app_info);
+        return app_info;
     }
 
-    private static bool validate (AppInfo appinfo, string app_name) {
-        string token = app_name.down ().strip ();
-
-        string? token_executable = token;
-        if (!token_executable.has_prefix (Path.DIR_SEPARATOR_S)) {
-            token_executable = Environment.find_program_in_path (token_executable);
-        }        
-
-        string? app_executable = appinfo.get_executable ();
-        if (!app_executable.has_prefix (Path.DIR_SEPARATOR_S)) {
-            app_executable = Environment.find_program_in_path (app_executable);
-        }
-
-        string[] args;
-        try {
-            Shell.parse_argv (appinfo.get_commandline (), out args);
-        } catch (ShellError e) {
-            warning ("%s\n", e.message);
-        }
-
-        if (appinfo.get_name () != null
-        && appinfo.get_executable () != null
-        && appinfo.get_display_name () != null) {
-            if (appinfo.get_name ().down () == token
-                || token_executable == app_executable
-                || args[0] == token
-                || appinfo.get_display_name ().down ().contains (token))
-                return true;
-        }            
-    
-        return false;    
+    private static bool validate (AppInfo appinfo, string name) {
+       string? app_executable = appinfo.get_executable ();
+       string? app_name = appinfo.get_name ();
+       string? app_display_name = appinfo.get_display_name ();
+
+       if (app_name == null || app_executable == null || app_display_name == null) {
+           return false;
+       }
+
+       string token = name.down ().strip ();
+       string? token_executable = token;
+       if (!token_executable.has_prefix (Path.DIR_SEPARATOR_S)) {
+           token_executable = Environment.find_program_in_path (token_executable);
+       }
+
+       if (!app_executable.has_prefix (Path.DIR_SEPARATOR_S)) {
+           app_executable = Environment.find_program_in_path (app_executable);
+       }
+
+       string[] args;
+
+       try {
+           Shell.parse_argv (appinfo.get_commandline (), out args);
+       } catch (ShellError e) {
+           warning ("%s", e.message);
+       }
+
+       return (app_name.down () == token
+           || token_executable == app_executable
+           || args[0] == token
+           || app_display_name.down ().contains (token));
     }
 }
\ No newline at end of file

=== modified file 'src/Widgets/AppEntry.vala'
--- src/Widgets/AppEntry.vala	2016-05-27 15:10:53 +0000
+++ src/Widgets/AppEntry.vala	2016-07-18 15:43:26 +0000
@@ -16,9 +16,9 @@
  */
 
 public class AppEntry : Gtk.ListBoxRow {
-    public string app_name;
+    public string desktop_id;
     public Gtk.Button clear_btn_entry;
-    public AppInfo? appinfo = null;
+    public AppInfo? app_info = null;
     public Wnck.Window? app_window;
 
     public signal void destroy_entry ();
@@ -33,22 +33,21 @@
         margin_end = 6;
 
         var notification = entry.notification;
-        app_name = notification.app_name;
+        desktop_id = notification.desktop_id;
         app_window = _app_window;
+        app_info = notification.app_info;
 
         app_notifications = new List<NotificationEntry> ();
         add_notification_entry (entry);
 
-        appinfo = notification.appinfo;
-
         var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 12);
 
         /* Capitalize the first letter */
         char[] utf8 = notification.display_name.to_utf8 ();
         utf8[0] = utf8[0].toupper ();
 
-        if (appinfo != null) {
-            display_name = appinfo.get_name ();
+        if (app_info != null) {
+            display_name = app_info.get_name ();
         } else {
             display_name = string.join ("", utf8);
         }
@@ -63,8 +62,8 @@
         });
 
         string icon = "";
-        if (notification.app_icon == "" && appinfo != null) {
-            var glib_icon = appinfo.get_icon ();
+        if (notification.app_icon == "" && app_info != null) {
+            var glib_icon = app_info.get_icon ();
             icon = glib_icon.to_string ();
         } else {
             icon = notification.app_icon;

=== modified file 'src/Widgets/NotificationsList.vala'
--- src/Widgets/NotificationsList.vala	2016-06-20 12:37:34 +0000
+++ src/Widgets/NotificationsList.vala	2016-07-18 15:43:26 +0000
@@ -114,7 +114,7 @@
 
     private AppEntry add_app_entry (NotificationEntry entry) {
         AppEntry app_entry;
-        bool add = !(entry.notification.app_name in construct_app_names ());
+        bool add = !(entry.notification.desktop_id in construct_desktop_id_list ());
         if (add) {
             var window = get_window_from_entry (entry);
             app_entry = new AppEntry (entry, window);
@@ -128,11 +128,11 @@
             app_entries.append (app_entry);
             prepend (app_entry);
             insert (entry, 1);
-            table.insert (app_entry.app_name, 0);
+            table.insert (app_entry.desktop_id, 0);
         } else {
-            app_entry = get_app_entry_from_app_name (entry.notification.app_name);
+            app_entry = get_app_entry_from_desktop_id (entry.notification.desktop_id);
             if (app_entry != null) {
-                int insert_pos = table.@get (app_entry.app_name);
+                int insert_pos = table.@get (app_entry.desktop_id);
                 insert (entry, insert_pos + 1);                
             }
         }
@@ -199,10 +199,10 @@
         }
     }
 
-    private AppEntry? get_app_entry_from_app_name (string app_name) {
+    private AppEntry? get_app_entry_from_desktop_id (string desktop_id) {
         AppEntry? entry = null;
         app_entries.@foreach ((_entry) => {
-            if (_entry.app_name == app_name) {
+            if (_entry.desktop_id == desktop_id) {
                 entry = _entry;
                 return;
             }
@@ -211,13 +211,13 @@
         return entry;
     }
 
-    private string[] construct_app_names () {
-        string[] app_names = {};
+    private string[] construct_desktop_id_list () {
+        string[] desktop_id_list = {};
         app_entries.@foreach ((entry) => {
-             app_names += entry.app_name;
+            desktop_id_list += entry.desktop_id;
         });
 
-        return app_names;
+        return desktop_id_list;
     }
 
     private void on_row_activated (Gtk.ListBoxRow row) {
@@ -233,9 +233,9 @@
                 ((AppEntry) row).app_window.unminimize (Gtk.get_current_event_time ());
                 ((AppEntry) row).clear_btn_entry.clicked ();
                 close_popover ();
-            } else if (((AppEntry) row).appinfo != null) {
+            } else if (((AppEntry) row).app_info != null) {
                 try {
-                    ((AppEntry) row).appinfo.launch (null, null);
+                    ((AppEntry) row).app_info.launch (null, null);
                 } catch (Error e) {
                     error ("%s\n", e.message);
                 }