summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Ulbrich <[email protected]>2016-01-09 16:16:24 +0100
committerWolfgang Ulbrich <[email protected]>2016-01-13 14:58:40 +0100
commit65a3791db8209d7a001c1af6f944e8dd180859e1 (patch)
tree5c291f1e21d3e862f1aed4521d78d270f64102bc
parentf6f8c610ace0f0979237da8fba5b4afa6e137e67 (diff)
downloadcaja-65a3791db8209d7a001c1af6f944e8dd180859e1.tar.bz2
caja-65a3791db8209d7a001c1af6f944e8dd180859e1.tar.xz
icon-info: use gdk_pixbuf_new_from_stream_at_scale()
https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=83a83e3
-rw-r--r--libcaja-private/caja-icon-info.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libcaja-private/caja-icon-info.c b/libcaja-private/caja-icon-info.c
index a32cf991..3a63bb44 100644
--- a/libcaja-private/caja-icon-info.c
+++ b/libcaja-private/caja-icon-info.c
@@ -25,7 +25,6 @@
#include "caja-default-file-icon.h"
#include <gtk/gtk.h>
#include <gio/gio.h>
-#include <eel/eel-gdk-pixbuf-extensions.h>
struct _CajaIconInfo
{
@@ -383,7 +382,10 @@ caja_icon_info_lookup (GIcon *icon,
NULL, NULL, NULL);
if (stream)
{
- pixbuf = eel_gdk_pixbuf_load_from_stream_at_size (stream, size);
+ pixbuf = gdk_pixbuf_new_from_stream_at_scale (stream,
+ size, size, TRUE,
+ NULL, NULL);
+ g_input_stream_close (stream, NULL, NULL);
g_object_unref (stream);
}