nemo-action.c: Fix loading of absolute icon paths.

This is allowed via the layout editor but absolute paths were
not being detected and handled correctly in Nemo.

Author: mtwebster

action-layout-editor/nemo_action_layout_editor.py

@@ -47,10 +47,11 @@ def __init__(self, label, accel_string):
         self.label = _(label)
 
 class Row():
-    def __init__(self, row_meta=None, keyfile=None, path=None, enabled=True):
+    def __init__(self, row_meta=None, keyfile=None, path=None, enabled=True, scale_factor=1):
         self.keyfile = keyfile
         self.row_meta = row_meta
         self.enabled = enabled
+        self.scale_factor = scale_factor
         self.path = path  # PosixPath
 
     def get_icon_string(self, original=False):
@@ -81,7 +82,7 @@ def get_icon_type_and_data(self, original=False):
 
         if icon_string.startswith("/"):
             pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(icon_string, 16, 16)
-            surface = Gdk.cairo_surface_create_from_pixbuf(pixbuf, self.main_window.get_scale_factor(), None)
+            surface = Gdk.cairo_surface_create_from_pixbuf(pixbuf, self.scale_factor, None)
             return ("surface", surface)
 
         return ("icon-name", icon_string)
@@ -501,6 +502,7 @@ def load_installed_actions(self):
 
     def fill_model(self, model, parent, items, installed_actions):
         disabled_actions = self.nemo_plugin_settings.get_strv("disabled-actions")
+        scale_factor = self.main_window.get_scale_factor()
 
         for item in items:
             row_type = item.get("type")
@@ -514,7 +516,7 @@ def fill_model(self, model, parent, items, installed_actions):
                     print("Ignoring missing installed action %s" % uuid)
                     continue
 
-                iter = model.append(parent, [new_hash(), uuid, row_type, Row(item, kf, path, path.name not in disabled_actions)])
+                iter = model.append(parent, [new_hash(), uuid, row_type, Row(item, kf, path, path.name not in disabled_actions, scale_factor)])
 
                 del installed_actions[uuid]
             elif row_type == ROW_TYPE_SEPARATOR:
@@ -537,7 +539,7 @@ def push_disabled(key):
 
         for uuid, (path, kf) in sorted_actions.items():
             enabled = path.name not in disabled_actions
-            model.append(parent, [new_hash(), uuid, ROW_TYPE_ACTION, Row(None, kf, path, enabled)])
+            model.append(parent, [new_hash(), uuid, ROW_TYPE_ACTION, Row(None, kf, path, enabled, scale_factor)])
 
     def save_disabled_list(self):
         disabled = []

libnemo-private/nemo-action.c

@@ -642,6 +642,7 @@ nemo_action_constructed (GObject *object)
 {
     NemoAction *action = NEMO_ACTION (object);
     NemoActionPrivate *priv = nemo_action_get_instance_private (action);
+    GIcon *gicon;
 
     G_OBJECT_CLASS (nemo_action_parent_class)->constructed (object);
 
@@ -666,6 +667,23 @@ nemo_action_constructed (GObject *object)
                                               KEY_ICON_NAME,
                                               NULL);
 
+    gicon = NULL;
+
+    if (icon_name != NULL) {
+        if (g_path_is_absolute (icon_name)) {
+            GFile *icon_file = g_file_new_for_path (icon_name);
+            if (g_file_is_native (icon_file)) {
+                gicon = g_file_icon_new (icon_file);
+            }
+            g_object_unref (icon_file);
+        }
+
+        if (gicon == NULL) {
+            gicon = g_themed_icon_new (icon_name);
+        }
+    }
+    g_free (icon_name);
+
     gchar *stock_id = g_key_file_get_string (key_file,
                                              ACTION_FILE_GROUP,
                                              KEY_STOCK_ID,
@@ -851,7 +869,7 @@ nemo_action_constructed (GObject *object)
     g_object_set  (action,
                    "label", orig_label,
                    "tooltip", orig_tt,
-                   "icon-name", icon_name,
+                   "gicon", gicon,
                    "stock-id", stock_id,
                     NULL);
 
@@ -877,7 +895,7 @@ nemo_action_constructed (GObject *object)
     queue_recalc_gsettings_conditions (action);
     DEBUG ("Initial action gsettings and dbus complete (%s)", action->key_file_path);
 
-    g_free (icon_name);
+    g_clear_object (&gicon);
     g_free (stock_id);
     g_free (quote_type_string);
     g_key_file_free (key_file);
@@ -1505,9 +1523,28 @@ nemo_action_override_label (NemoAction  *action,
 
 void
 nemo_action_override_icon (NemoAction  *action,
-                           const gchar *icon)
+                           const gchar *icon_name)
 {
-    gtk_action_set_icon_name (GTK_ACTION (action), icon);
+    GIcon *gicon = NULL;
+
+    if (icon_name != NULL && *icon_name != '\0') {
+        if (g_path_is_absolute (icon_name)) {
+            GFile *icon_file = g_file_new_for_path (icon_name);
+            if (g_file_is_native (icon_file)) {
+                gicon = g_file_icon_new (icon_file);
+            }
+            g_object_unref (icon_file);
+        }
+
+        if (gicon == NULL) {
+            gicon = g_themed_icon_new (icon_name);
+        }
+
+        gtk_action_set_gicon (GTK_ACTION (action), gicon);
+        g_clear_object (&gicon);
+    } else {
+        gtk_action_set_gicon(GTK_ACTION (action), NULL);
+    }
 }
 
 const gchar *