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 d9ef715ea11e92917414d5d7bddd4dd1487fac1b but it
causes problems for other (more important) use cases.

https://bugzilla.gnome.org/show_bug.cgi?id=688808

1 files changed, 2 insertions, 18 deletions

diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index 84be583bd..fa38545e8 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -4223,7 +4223,6 @@ nautilus_file_get_icon (NautilusFile *file,
 {
 	NautilusIconInfo *icon;
 	GIcon *gicon;
-	gboolean custom_icon;
 	GdkPixbuf *raw_pixbuf, *scaled_pixbuf;
 	int modified_size;
 
@@ -4231,30 +4230,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;
 	}