Merge lp:~donadigo/slingshot/use-glib-desktop-app-info into lp:~elementary-pantheon/slingshot/trunk

[Adam Bieńkowski]

* Use DesktopAppInfo instead of KeyFile

This branch fixes bug #1528720: "Use built-in GLib functions for Desktop files".

We don't need everything actions related in the App class since this is already implemented in DesktopAppInfo itself.

[Danielle Foré (danrabbit)]

I can confirm that this works as expected. Nice cleanup :)

review: Approve

=== modified file 'src/Backend/App.vala'
--- src/Backend/App.vala	2016-02-17 19:06:52 +0000
+++ src/Backend/App.vala	2017-01-02 23:05:37 +0000
@@ -52,8 +52,6 @@
 
     public Synapse.Match? match { get; private set; default = null; }
     public Synapse.Match? target { get; private set; default = null; }
-    public Gee.ArrayList<string> actions { get; private set; default = null; }
-    public Gee.HashMap<string, string> actions_map { get; private set; default = null; }
 
     public signal void launched (App app);
 
@@ -61,18 +59,6 @@
     public signal void unity_update_info ();
 #endif
 
-    // for FDO Desktop Actions
-    // see http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#extra-actions
-    private const string DESKTOP_ACTION_KEY = "Actions";
-    private const string DESKTOP_ACTION_GROUP_NAME = "Desktop Action %s";
-    // for the Unity static quicklists
-    // see https://wiki.edubuntu.org/Unity/LauncherAPI#Static_Quicklist_entries
-    private const string UNITY_QUICKLISTS_KEY = "X-Ayatana-Desktop-Shortcuts";
-    private const string UNITY_QUICKLISTS_SHORTCUT_GROUP_NAME = "%s Shortcut Group";
-    private const string UNITY_QUICKLISTS_TARGET_KEY = "TargetEnvironment";
-    private const string UNITY_QUICKLISTS_TARGET_VALUE = "Unity";
-    private const string[] SUPPORTED_GETTEXT_DOMAINS_KEYS = {"X-Ubuntu-Gettext-Domain", "X-GNOME-Gettext-Domain"};
-
     public App (GMenu.TreeEntry entry) {
         app_type = AppType.APP;
 
@@ -160,88 +146,6 @@
         return true;
     }
 
-    // Quicklist code from Plank
-    public void init_actions () throws KeyFileError {
-        actions = new Gee.ArrayList<string> ();
-        actions_map = new Gee.HashMap<string, string> ();
-
-        // get FDO Desktop Actions
-        // see http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#extra-actions
-        // get the Unity static quicklists
-        // see https://wiki.edubuntu.org/Unity/LauncherAPI#Static Quicklist entries
-        KeyFile file;
-        try {
-            file = new KeyFile ();
-            file.load_from_file (desktop_path, 0);
-        } catch (Error e) {
-            critical ("%s: %s", desktop_path, e.message);
-        }
-
-        string? textdomain = null;
-        foreach (var domain_key in SUPPORTED_GETTEXT_DOMAINS_KEYS)
-            if (file.has_key (KeyFileDesktop.GROUP, domain_key)) {
-                textdomain = file.get_string (KeyFileDesktop.GROUP, domain_key);
-                break;
-            }
-        if (actions != null && actions_map != null) {
-            actions.clear ();
-            actions_map.clear ();
-            string[] keys = {DESKTOP_ACTION_KEY, UNITY_QUICKLISTS_KEY};
-
-            foreach (var key in keys) {
-                if (!file.has_key (KeyFileDesktop.GROUP, key))
-                    continue;
-
-                foreach (var action in file.get_string_list (KeyFileDesktop.GROUP, key)) {
-                    var group = DESKTOP_ACTION_GROUP_NAME.printf (action);
-                    if (!file.has_group (group)) {
-                        group = UNITY_QUICKLISTS_SHORTCUT_GROUP_NAME.printf (action);
-                        if (!file.has_group (group))
-                            continue;
-                    }
-
-                    // check for TargetEnvironment
-                    if (file.has_key (group, UNITY_QUICKLISTS_TARGET_KEY)) {
-                        var target = file.get_string (group, UNITY_QUICKLISTS_TARGET_KEY);
-                        if (target != UNITY_QUICKLISTS_TARGET_VALUE)
-                            continue;
-                    }
-
-                    // check for OnlyShowIn
-                    if (file.has_key (group, KeyFileDesktop.KEY_ONLY_SHOW_IN)) {
-                        var found = false;
-
-                        foreach (var s in file.get_string_list (group, KeyFileDesktop.KEY_ONLY_SHOW_IN))
-                            if (s == UNITY_QUICKLISTS_TARGET_VALUE) {
-                                found = true;
-                                break;
-                            }
-
-                        if (!found)
-                            continue;
-                    }
-
-                    var action_name = file.get_locale_string (group, KeyFileDesktop.KEY_NAME);
-
-                    var action_icon = "";
-                    if (file.has_key (group, KeyFileDesktop.KEY_ICON))
-                        action_icon = file.get_locale_string (group, KeyFileDesktop.KEY_ICON);
-
-                    var action_exec = "";
-                    if (file.has_key (group, KeyFileDesktop.KEY_EXEC))
-                        action_exec = file.get_string (group, KeyFileDesktop.KEY_EXEC);
-
-                    // apply given gettext-domain if available
-                    if (textdomain != null)
-                        action_name = GLib.dgettext (textdomain, action_name).dup ();
-
-                    actions.add (action_name);
-                    actions_map.set (action_name, "%s;;%s".printf (action_exec, action_icon));
-                }
-            }
-        }
-    }
-
 #if HAS_PLANK_0_11
     public void perform_unity_update (string sender_name, VariantIter prop_iter) {
         unity_sender_name = sender_name;

=== modified file 'src/Widgets/AppEntry.vala'
--- src/Widgets/AppEntry.vala	2016-12-27 21:08:33 +0000
+++ src/Widgets/AppEntry.vala	2017-01-02 23:05:37 +0000
@@ -191,25 +191,17 @@
 #endif
 
     private void create_menu () {
-        // Display the apps static quicklist items in a popover menu
-        if (application.actions == null) {
-            try {
-                application.init_actions ();
-            } catch (KeyFileError e) {
-                critical ("%s: %s", desktop_path, e.message);
-            }
-        }
-
         menu = new Gtk.Menu ();
 
-        foreach (var action in application.actions) {
-            var menuitem = new Gtk.MenuItem.with_mnemonic (action);
+        var app_info = new DesktopAppInfo (desktop_id);
+        foreach (unowned string _action in app_info.list_actions ()) {
+            string action = _action.dup ();
+            var menuitem = new Gtk.MenuItem.with_mnemonic (app_info.get_action_name (action));
             menu.add (menuitem);
 
             menuitem.activate.connect (() => {
                 try {
-                    var values = application.actions_map.get (action).split (";;");
-                    AppInfo.create_from_commandline (values[0], null, AppInfoCreateFlags.NONE).launch (null, null);
+                    app_info.launch_action (action, new AppLaunchContext ());
                     app_launched ();
                 } catch (Error e) {
                     critical ("%s: %s", desktop_path, e.message);