nautilus r14324 - in trunk: . libnautilus-private

[cneumair svn gnome org]

Author: cneumair
Date: Mon Jul  7 17:39:58 2008
New Revision: 14324
URL: http://svn.gnome.org/viewvc/nautilus?rev=14324&view=rev

Log:
2008-07-07  Christian Neumair  <cneumair gnome org>

	* libnautilus-private/nautilus-ui-utilities.c
	(nautilus_toolbar_action_from_menu_item):
	Use GTK_ICON_SIZE_LARGE_TOOLBAR instead of hard coding the icon size
	to 48. Fixes #541527. Thanks to Gilles Dartiguelongue.


Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-ui-utilities.c

Modified: trunk/libnautilus-private/nautilus-ui-utilities.c
==============================================================================
--- trunk/libnautilus-private/nautilus-ui-utilities.c	(original)
+++ trunk/libnautilus-private/nautilus-ui-utilities.c	Mon Jul  7 17:39:58 2008
@@ -187,6 +187,7 @@
 	GtkAction *action;
 	GdkPixbuf *pixbuf;
 	NautilusIconInfo *info;
+	int icon_size;
 	
 	g_object_get (G_OBJECT (item), 
 		      "name", &name, "label", &label, 
@@ -201,9 +202,10 @@
 				 icon_name);
 	
 	if (icon_name != NULL) {
-		info = nautilus_icon_info_lookup_from_name (icon_name, 24);
+		icon_size = nautilus_get_icon_size_for_stock_size (GTK_ICON_SIZE_LARGE_TOOLBAR);
+		info = nautilus_icon_info_lookup_from_name (icon_name, icon_size);
 
-		pixbuf = nautilus_icon_info_get_pixbuf_nodefault_at_size (info, 24);
+		pixbuf = nautilus_icon_info_get_pixbuf_nodefault_at_size (info, icon_size);
 		if (pixbuf != NULL) {
 			g_object_set_data_full (G_OBJECT (action), "toolbar-icon",
 						pixbuf,