From f5e4abd61e848aacaefab639faa8f463e6065e2e Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Thu, 23 Oct 2008 10:00:44 +0000 Subject: [PATCH] Merged from trunk: 2008-10-23 Alexander Larsson 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. svn path=/branches/gtk-2-14/; revision=21703 --- ChangeLog | 13 +++++++++++++ gtk/gtkfilesystem.c | 8 ++++++++ 2 files changed, 21 insertions(+) diff --git a/ChangeLog b/ChangeLog index af72a995ca..5ed0408696 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2008-10-23 Alexander Larsson + + 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. + 2008-10-22 Matthias Clasen Merged from trunk: diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c index 2b2d44a3ba..3960be29bb 100644 --- a/gtk/gtkfilesystem.c +++ b/gtk/gtkfilesystem.c @@ -1738,6 +1738,14 @@ _gtk_file_info_render_icon (GFileInfo *info, 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;