diff options
author | Christian Neumair <cneumair@gnome.org> | 2008-09-01 10:04:48 +0000 |
---|---|---|
committer | Christian Neumair <cneumair@src.gnome.org> | 2008-09-01 10:04:48 +0000 |
commit | 80946aa5b99d26eab80d7ac90b7d4c38060ca2d0 (patch) | |
tree | 5a2de5465c98611452abad3d554c37690683e829 /libnautilus-private/nautilus-icon-info.c | |
parent | 9116486eeef0983ba35778bbb1cfd0b131295d48 (diff) | |
download | nautilus-80946aa5b99d26eab80d7ac90b7d4c38060ca2d0.tar.gz |
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
Diffstat (limited to 'libnautilus-private/nautilus-icon-info.c')
-rw-r--r-- | libnautilus-private/nautilus-icon-info.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/libnautilus-private/nautilus-icon-info.c b/libnautilus-private/nautilus-icon-info.c index 6907fc32c..db62b2764 100644 --- a/libnautilus-private/nautilus-icon-info.c +++ b/libnautilus-private/nautilus-icon-info.c @@ -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); |