forked from AuroraMiddleware/gtk
Bug 528320 - Incorrect icons displayed for files with custom mimetype
2008-10-23 Alexander Larsson <alexl@redhat.com> 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=/trunk/; revision=21702
This commit is contained in:
parent
e108b3d2d9
commit
fb55cf75f0
11
ChangeLog
11
ChangeLog
@ -1,3 +1,14 @@
|
||||
2008-10-23 Alexander Larsson <alexl@redhat.com>
|
||||
|
||||
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 Behdad Esfahbod <behdad@gnome.org>
|
||||
|
||||
Bug 555920 – gtkentry.c passes wrong enum to
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user