Commit f69e4722 authored by Cosimo Cecchi's avatar Cosimo Cecchi

file: revert to previous framing behavior for custom icons

I.e. don't treat them like thumbnails, and don't add a border.
This was changed in d9ef715e but it
causes problems for other (more important) use cases.

https://bugzilla.gnome.org/show_bug.cgi?id=688808
parent 0e796d23
......@@ -4232,7 +4232,6 @@ nautilus_file_get_icon (NautilusFile *file,
{
NautilusIconInfo *icon;
GIcon *gicon;
gboolean custom_icon;
GdkPixbuf *raw_pixbuf, *scaled_pixbuf;
int modified_size;
......@@ -4240,30 +4239,15 @@ nautilus_file_get_icon (NautilusFile *file,
return NULL;
}
custom_icon = FALSE;
gicon = get_custom_icon (file);
if (gicon) {
custom_icon = TRUE;
} else {
if (gicon == NULL) {
gicon = get_link_icon (file);
}
if (gicon) {
if (gicon != NULL) {
icon = nautilus_icon_info_lookup (gicon, size);
g_object_unref (gicon);
if (custom_icon) {
raw_pixbuf = nautilus_icon_info_get_pixbuf (icon);
if (raw_pixbuf != NULL) {
nautilus_ui_frame_image (&raw_pixbuf);
g_object_unref (icon);
icon = nautilus_icon_info_new_for_pixbuf (raw_pixbuf);
g_object_unref (raw_pixbuf);
}
}
return icon;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment