]> Pileus Git - ~andy/gtk/commitdiff
icon-theme: Allow symbolic GFileIcons
authorJasper St. Pierre <jstpierre@mecheye.net>
Sat, 19 May 2012 05:13:14 +0000 (01:13 -0400)
committerJasper St. Pierre <jstpierre@mecheye.net>
Fri, 1 Jun 2012 13:17:00 +0000 (09:17 -0400)
gtk_icon_info_load_symbolic checks for the existance of a filename parameter
so it can include it along with the stylesheet. We don't set the filename
parameter when creating the info for a GFileIcon, for some reason.

https://bugzilla.gnome.org/show_bug.cgi?id=676356

gtk/gtkicontheme.c

index 3eb333ff987621e07259106ca9dd21f0d9623513..fb598370162a7853150325606b5a8da5759c175c 100644 (file)
@@ -3862,6 +3862,13 @@ gtk_icon_theme_lookup_by_gicon (GtkIconTheme       *icon_theme,
       info = icon_info_new ();
       info->loadable = G_LOADABLE_ICON (g_object_ref (icon));
 
+      if (G_IS_FILE_ICON (icon))
+        {
+          GFile *file = g_file_icon_get_file (G_FILE_ICON (icon));
+          if (file != NULL)
+            info->filename = g_file_get_path (file);
+        }
+
       info->dir_type = ICON_THEME_DIR_UNTHEMED;
       info->dir_size = size;
       info->desired_size = size;