Revert "icon theme: Avoid a string copy"

This reverts commit 0895f0211e535ac0bdf7e461bb0e046bdee60c4d.

This negatively affected icons that are included as
resources, since peek_path returns NULL for them.

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index e44b953017980ccf9ba2530bec411d5f97a93a63..ee7f7c49bb779b9078329be4fe460dc7b3565ea3 100644 (file)
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -3276,16 +3276,17 @@ gtk_icon_info_get_filename (GtkIconInfo *icon_info)
 gboolean
 gtk_icon_info_is_symbolic (GtkIconInfo *icon_info)
 {
-  const char *path;
+  gchar *icon_uri;
   gboolean is_symbolic;
 
   g_return_val_if_fail (GTK_IS_ICON_INFO (icon_info), FALSE);
 
-  path = NULL;
+  icon_uri = NULL;
   if (icon_info->icon_file)
-    path = g_file_peek_path (icon_info->icon_file);
+    icon_uri = g_file_get_uri (icon_info->icon_file);
 
-  is_symbolic = (path != NULL) && (icon_uri_is_symbolic (path, -1));
+  is_symbolic = (icon_uri != NULL) && (icon_uri_is_symbolic (icon_uri, -1));
+  g_free (icon_uri);
 
   return is_symbolic;
 }