Require eel 2.23.91.

2008-09-01  Christian Neumair  <cneumair@gnome.org>

	* configure.in:
	Require eel 2.23.91.

	* libnautilus-private/nautilus-icon-info.c
	(nautilus_icon_info_lookup):
	Use eel_gdk_pixbuf_load_from_stream_at_size() for loading SVG icons at
	the desired size. Fixes #529371.

svn path=/trunk/; revision=14554
This commit is contained in:
Christian Neumair 2008-09-01 10:04:48 +00:00 committed by Christian Neumair
parent 9116486eee
commit 80946aa5b9
3 changed files with 12 additions and 19 deletions

View file

@ -1,3 +1,13 @@
2008-09-01 Christian Neumair <cneumair@gnome.org>
* configure.in:
Require eel 2.23.91.
* libnautilus-private/nautilus-icon-info.c
(nautilus_icon_info_lookup):
Use eel_gdk_pixbuf_load_from_stream_at_size() for loading SVG icons at
the desired size. Fixes #529371.
2008-09-01 Christian Neumair <cneumair@gnome.org>
* src/file-manager/fm-directory-view.c (done_loading):

View file

@ -4,7 +4,7 @@ dnl ===========================================================================
m4_define(bonobo_activation_minver, 2.1.0)
m4_define(bonobo_minver, 2.1.0)
m4_define(eel_minver, 2.23.2)
m4_define(eel_minver, 2.23.91)
m4_define(glib_minver, 2.17.5)
m4_define(gnome_desktop_minver, 2.9.91)
m4_define(gnome_minver, 2.14.0)

View file

@ -352,25 +352,8 @@ nautilus_icon_info_lookup (GIcon *icon,
size,
NULL, NULL, NULL);
if (stream) {
GdkPixbuf *scaled_pixbuf;
int w, h, s;
double scale;
pixbuf = eel_gdk_pixbuf_load_from_stream (stream);
pixbuf = eel_gdk_pixbuf_load_from_stream_at_size (stream, size);
g_object_unref (stream);
w = gdk_pixbuf_get_width (pixbuf);
h = gdk_pixbuf_get_height (pixbuf);
s = MAX (w, h);
if (size != s) {
scale = (double)size / s;
scaled_pixbuf = gdk_pixbuf_scale_simple (pixbuf,
w * scale, h * scale,
GDK_INTERP_BILINEAR);
g_object_unref (pixbuf);
pixbuf = scaled_pixbuf;
}
}
icon_info = nautilus_icon_info_new_for_pixbuf (pixbuf);