gtk+ r21703 - in branches/gtk-2-14: . gtk

[alexl svn gnome org]

Author: alexl
Date: Thu Oct 23 10:00:44 2008
New Revision: 21703
URL: http://svn.gnome.org/viewvc/gtk+?rev=21703&view=rev

Log:
2008-10-23  Alexander Larsson  <alexl redhat com>

	Merged from trunk:

	Bug 528320 - Incorrect icons displayed for files with custom mimetype icons
	
        * gtk/gtkfilesystem.c:
        (_gtk_file_info_render_icon):
	Fall back on default file icon if there was no icon or it
	was not found in the theme. This goes with the corresponding
	change in glib to not add the fallback icon, but is useful
	in other cases too.




Modified:
   branches/gtk-2-14/ChangeLog
   branches/gtk-2-14/gtk/gtkfilesystem.c

Modified: branches/gtk-2-14/gtk/gtkfilesystem.c
==============================================================================
--- branches/gtk-2-14/gtk/gtkfilesystem.c	(original)
+++ branches/gtk-2-14/gtk/gtkfilesystem.c	Thu Oct 23 10:00:44 2008
@@ -1738,6 +1738,14 @@
 
       if (icon)
 	pixbuf = get_pixbuf_from_gicon (icon, widget, icon_size, NULL);
+
+      if (!pixbuf)
+	{
+	   /* Use general fallback for all files without icon */
+	  icon = g_themed_icon_new ("text-x-generic");
+	  pixbuf = get_pixbuf_from_gicon (icon, widget, icon_size, NULL);
+	  g_object_unref (icon);
+	}
     }
 
   return pixbuf;