nautilus r14554 - in trunk: . libnautilus-private

[cneumair svn gnome org]

Author: cneumair
Date: Mon Sep  1 10:04:48 2008
New Revision: 14554
URL: http://svn.gnome.org/viewvc/nautilus?rev=14554&view=rev

Log:
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.


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libnautilus-private/nautilus-icon-info.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Sep  1 10:04:48 2008
@@ -4,7 +4,7 @@
 
 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)

Modified: trunk/libnautilus-private/nautilus-icon-info.c
==============================================================================
--- trunk/libnautilus-private/nautilus-icon-info.c	(original)
+++ trunk/libnautilus-private/nautilus-icon-info.c	Mon Sep  1 10:04:48 2008
@@ -352,25 +352,8 @@
 					       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);