file-roller r2363 - in trunk: . src

[paobac svn gnome org]

Author: paobac
Date: Sat Jul 12 06:21:49 2008
New Revision: 2363
URL: http://svn.gnome.org/viewvc/file-roller?rev=2363&view=rev

Log:
2008-07-12  Paolo Bacchilega  <paobac svn gnome org>

	* src/gtk-utils.c (get_icon_pixbuf): 
	
	Fixed bug #542541 â icon lookup code is broken
	Patch by Matthias Clasen.


Modified:
   trunk/ChangeLog
   trunk/src/gtk-utils.c

Modified: trunk/src/gtk-utils.c
==============================================================================
--- trunk/src/gtk-utils.c	(original)
+++ trunk/src/gtk-utils.c	Sat Jul 12 06:21:49 2008
@@ -806,15 +806,8 @@
 	g_object_get (icon, "names", &icon_names, NULL);
 
 	icon_info = gtk_icon_theme_choose_icon (icon_theme, (const char **)icon_names, size, 0);
-	if (icon_info == NULL) {
-		GIcon *default_icon;
-
-		default_icon = g_content_type_get_icon ("gnome-fs-regular");
-		pixbuf = get_icon_pixbuf (icon_theme, G_THEMED_ICON (default_icon), size);
-		g_object_unref (default_icon);
-
-		return pixbuf;
-	}
+	if (icon_info == NULL) 
+		icon_info = gtk_icon_theme_lookup_icon (icon_theme, "folder", size, GTK_ICON_LOOKUP_USE_BUILTIN);
 
 	pixbuf = gtk_icon_info_load_icon (icon_info, &error);
 	if (pixbuf == NULL) {