Index: src/nautilus-bookmarks-window.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-bookmarks-window.c,v
retrieving revision 1.83
diff -u -p -r1.83 nautilus-bookmarks-window.c
--- src/nautilus-bookmarks-window.c	14 Feb 2005 10:59:23 -0000	1.83
+++ src/nautilus-bookmarks-window.c	22 May 2005 20:38:59 -0000
@@ -35,6 +35,7 @@
 #include <eel/eel-gnome-extensions.h>
 #include <libnautilus-private/nautilus-icon-factory.h>
 #include <libnautilus-private/nautilus-undo-signal-handlers.h>
+#include <gtk/gtkenums.h>
 #include <gtk/gtkhbbox.h>
 #include <gnome.h>
 #include <libgnomeui/gnome-help.h>
@@ -929,9 +930,7 @@ repopulate (void)
 
 		bookmark = nautilus_bookmark_list_item_at (bookmarks, index);
 		bookmark_name = nautilus_bookmark_get_name (bookmark);
-		bookmark_pixbuf = nautilus_bookmark_get_pixbuf (bookmark,
-								NAUTILUS_ICON_SIZE_SMALLER,
-								TRUE);
+		bookmark_pixbuf = nautilus_bookmark_get_pixbuf (bookmark, GTK_ICON_SIZE_MENU);
 		
 		gtk_list_store_append (store, &iter);
 		gtk_list_store_set (store, &iter, 
Index: src/nautilus-history-sidebar.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-history-sidebar.c,v
retrieving revision 1.2
diff -u -p -r1.2 nautilus-history-sidebar.c
--- src/nautilus-history-sidebar.c	22 Nov 2004 15:24:37 -0000	1.2
+++ src/nautilus-history-sidebar.c	22 May 2005 20:38:59 -0000
@@ -33,6 +33,7 @@
 #include <eel/eel-preferences.h>
 #include <gtk/gtkcellrendererpixbuf.h>
 #include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtkenums.h>
 #include <gtk/gtkliststore.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtktreeselection.h>
@@ -101,7 +102,7 @@ update_history (NautilusHistorySidebar *
 	for (l = history; l != NULL; l = l->next) {
 		bookmark = nautilus_bookmark_copy (l->data);
 
-		pixbuf = nautilus_bookmark_get_pixbuf (bookmark, NAUTILUS_ICON_SIZE_FOR_MENUS, FALSE);
+		pixbuf = nautilus_bookmark_get_pixbuf (bookmark, GTK_ICON_SIZE_MENU);
 		name = nautilus_bookmark_get_name (bookmark);
 		gtk_list_store_append (store, &iter);
 		gtk_list_store_set (store, &iter,
Index: src/nautilus-sidebar-title.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-sidebar-title.c,v
retrieving revision 1.150
diff -u -p -r1.150 nautilus-sidebar-title.c
--- src/nautilus-sidebar-title.c	21 May 2005 16:13:59 -0000	1.150
+++ src/nautilus-sidebar-title.c	22 May 2005 20:38:59 -0000
@@ -314,7 +314,8 @@ update_icon (NautilusSidebarTitle *sideb
 	} else if (nautilus_icon_factory_is_icon_ready_for_file (sidebar_title->details->file)) {
 		pixbuf = nautilus_icon_factory_get_pixbuf_for_file (sidebar_title->details->file,
 								    "accept",
-								    sidebar_title->details->best_icon_size);
+								    sidebar_title->details->best_icon_size,
+								    FALSE);
 	} else if (sidebar_title->details->determined_icon) {
 		/* We used to know the icon for this file, but now the file says it isn't
 		 * ready. This means that some file info has been invalidated, which
@@ -503,7 +504,7 @@ update_emblems (NautilusSidebarTitle *si
 			(p->data, NULL,
 			 NAUTILUS_ICON_SIZE_STANDARD,
 			 NULL, NULL,
-			 FALSE, NULL);
+			 FALSE, FALSE, NULL);
 		if (pixbuf != NULL) {
 			add_emblem (sidebar_title, pixbuf);
 			g_object_unref (pixbuf);
Index: src/nautilus-spatial-window.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-spatial-window.c,v
retrieving revision 1.441
diff -u -p -r1.441 nautilus-spatial-window.c
--- src/nautilus-spatial-window.c	17 May 2005 13:27:36 -0000	1.441
+++ src/nautilus-spatial-window.c	22 May 2005 20:39:00 -0000
@@ -602,7 +602,7 @@ location_button_drag_begin_callback (Gtk
 	GdkPixbuf *pixbuf;
 
 	pixbuf = nautilus_icon_factory_get_pixbuf_for_file (NAUTILUS_WINDOW (window)->details->viewed_file,
-							    "open", get_dnd_icon_size (window));
+							    "open", get_dnd_icon_size (window), FALSE);
 
 	gtk_drag_set_icon_pixbuf (context, pixbuf, 0, 0);
 
Index: src/nautilus-window-menus.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-window-menus.c,v
retrieving revision 1.280
diff -u -p -r1.280 nautilus-window-menus.c
--- src/nautilus-window-menus.c	2 May 2005 21:24:59 -0000	1.280
+++ src/nautilus-window-menus.c	22 May 2005 20:39:00 -0000
@@ -49,6 +49,7 @@
 #include <libxml/parser.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkaboutdialog.h>
+#include <gtk/gtkenums.h>
 #include <libgnome/gnome-help.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-util.h>
@@ -166,7 +167,7 @@ nautilus_menus_append_bookmark_to_menu (
 	g_free (truncated_name);
 
 	/* Create menu item with pixbuf */
-	pixbuf = nautilus_bookmark_get_pixbuf (bookmark, NAUTILUS_ICON_SIZE_FOR_MENUS, FALSE);
+	pixbuf = nautilus_bookmark_get_pixbuf (bookmark, GTK_ICON_SIZE_MENU);
 
 	action_name = g_strdup_printf ("bookmark_%d", index_in_parent);
 
Index: src/file-manager/fm-directory-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-directory-view.c,v
retrieving revision 1.674
diff -u -p -r1.674 fm-directory-view.c
--- src/file-manager/fm-directory-view.c	17 May 2005 13:27:36 -0000	1.674
+++ src/file-manager/fm-directory-view.c	22 May 2005 20:39:04 -0000
@@ -59,6 +59,7 @@
 #include <gtk/gtkhbox.h>
 #include <gtk/gtktoggleaction.h>
 #include <gtk/gtkentry.h>
+#include <gtk/gtkenums.h>
 #include <gtk/gtkbindings.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-util.h>
@@ -4189,10 +4190,10 @@ add_extension_action_for_files (FMDirect
 	/* TODO: This should really use themed icons, but that
 	   doesn't work here yet */
 	if (icon != NULL) {
-		pixbuf = nautilus_icon_factory_get_pixbuf_from_name 
+		pixbuf = nautilus_icon_factory_get_pixbuf_from_name_with_stock_size
 			(icon,
 			 NULL,
-			 NAUTILUS_ICON_SIZE_FOR_MENUS, TRUE,
+			 GTK_ICON_SIZE_MENU,
 			 NULL);
 		if (pixbuf != NULL) {
 			g_object_set_data_full (G_OBJECT (action), "menu-icon",
@@ -4682,8 +4683,8 @@ add_script_to_scripts_menus (FMDirectory
 	tip = g_strdup_printf (_("Run \"%s\" on any selected items"), name);
 
 	launch_parameters = script_launch_parameters_new (file, directory_view);
-	pixbuf = nautilus_icon_factory_get_pixbuf_for_file 
-		(file, NULL, NAUTILUS_ICON_SIZE_FOR_MENUS);
+	pixbuf = nautilus_icon_factory_get_pixbuf_for_file_with_stock_size
+		(file, NULL, GTK_ICON_SIZE_MENU);
 
 	action_name = escape_action_name (uri, "script_");
 	escaped_label = eel_str_double_underscores (name);
@@ -4756,8 +4757,8 @@ add_submenu_to_directory_menus (FMDirect
 	ui_manager = nautilus_window_info_get_ui_manager (directory_view->details->window);
 	uri = nautilus_file_get_uri (file);
 	name = nautilus_file_get_display_name (file);
-	pixbuf = nautilus_icon_factory_get_pixbuf_for_file 
-		(file, NULL, NAUTILUS_ICON_SIZE_FOR_MENUS);
+	pixbuf = nautilus_icon_factory_get_pixbuf_for_file_with_stock_size
+		(file, NULL, GTK_ICON_SIZE_MENU);
 	add_submenu (ui_manager, action_group, merge_id, menu_path, uri, name, pixbuf);
 	add_submenu (ui_manager, action_group, merge_id, popup_path, uri, name, pixbuf);
 	add_submenu (ui_manager, action_group, merge_id, popup_bg_path, uri, name, pixbuf);
@@ -4936,8 +4937,8 @@ add_template_to_templates_menus (FMDirec
 		*dot = 0;
 	}
 
-	pixbuf = nautilus_icon_factory_get_pixbuf_for_file 
-		(file, NULL, NAUTILUS_ICON_SIZE_FOR_MENUS);
+	pixbuf = nautilus_icon_factory_get_pixbuf_for_file_with_stock_size
+		(file, NULL, GTK_ICON_SIZE_MENU);
 
 	action_name = escape_action_name (uri, "template_");
 	escaped_label = eel_str_double_underscores (name);
Index: src/file-manager/fm-list-model.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-list-model.c,v
retrieving revision 1.34
diff -u -p -r1.34 fm-list-model.c
--- src/file-manager/fm-list-model.c	6 Oct 2004 19:54:32 -0000	1.34
+++ src/file-manager/fm-list-model.c	22 May 2005 20:39:04 -0000
@@ -228,7 +228,7 @@ fm_list_model_get_value (GtkTreeModel *t
 			modifier = "visiting";
 		}
 		
-		icon = nautilus_icon_factory_get_pixbuf_for_file_force_size (file, modifier, icon_size);
+		icon = nautilus_icon_factory_get_pixbuf_for_file (file, modifier, icon_size, TRUE);
 
 		g_value_set_object (value, icon);
 		g_object_unref (icon);
@@ -256,9 +256,9 @@ fm_list_model_get_value (GtkTreeModel *t
 		if (emblem_icons != NULL) {
 			zoom_level = fm_list_model_get_zoom_level_from_emblem_column_id (column);
 			icon_size = nautilus_get_icon_size_for_zoom_level (zoom_level);
-			icon = nautilus_icon_factory_get_pixbuf_for_icon_force_size (
+			icon = nautilus_icon_factory_get_pixbuf_for_icon (
 				emblem_icons->data, NULL, icon_size,
-				NULL, NULL, FALSE, NULL);
+				NULL, NULL, TRUE, FALSE, NULL);
 			eel_g_list_free_deep (emblem_icons);
 	
 			g_value_set_object (value, icon);
Index: src/file-manager/fm-properties-window.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-properties-window.c,v
retrieving revision 1.215
diff -u -p -r1.215 fm-properties-window.c
--- src/file-manager/fm-properties-window.c	5 Apr 2005 08:54:39 -0000	1.215
+++ src/file-manager/fm-properties-window.c	22 May 2005 20:39:05 -0000
@@ -396,7 +396,7 @@ get_pixbuf_for_properties_window (FMProp
 	pixbuf = nautilus_icon_factory_get_pixbuf_for_icon (icon, NULL,
 							    NAUTILUS_ICON_SIZE_STANDARD,
 							    NULL, NULL,
-							    TRUE, NULL);
+							    FALSE, TRUE, NULL);
 
 	g_free (icon);
 
Index: src/file-manager/fm-tree-model.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-tree-model.c,v
retrieving revision 1.7
diff -u -p -r1.7 fm-tree-model.c
--- src/file-manager/fm-tree-model.c	11 Feb 2005 17:44:19 -0000	1.7
+++ src/file-manager/fm-tree-model.c	22 May 2005 20:39:06 -0000
@@ -35,6 +35,7 @@
 #include <libnautilus-private/nautilus-file-attributes.h>
 #include <libnautilus-private/nautilus-file.h>
 #include <libnautilus-private/nautilus-icon-factory.h>
+#include <gtk/gtkenums.h>
 #include <string.h>
 
 enum {
@@ -244,12 +245,12 @@ tree_node_get_pixbuf_from_factory (TreeN
 				   const char *modifier)
 {
 	if (node->parent == NULL) {
-		return nautilus_icon_factory_get_pixbuf_from_name
+		return nautilus_icon_factory_get_pixbuf_from_name_with_stock_size
 			(node->icon_name, NULL,
-			 NAUTILUS_ICON_SIZE_FOR_MENUS, TRUE, NULL);
+			 GTK_ICON_SIZE_MENU, NULL);
 	}
-	return nautilus_icon_factory_get_pixbuf_for_file_force_size
-		(node->file, modifier, NAUTILUS_ICON_SIZE_FOR_MENUS);
+	return nautilus_icon_factory_get_pixbuf_for_file_with_stock_size
+		(node->file, modifier, GTK_ICON_SIZE_MENU);
 }
 
 static gboolean
@@ -302,9 +303,9 @@ tree_node_get_emblem_pixbuf_from_factory
 	eel_string_list_free (emblems_to_ignore);
 
 	if (emblem_icons != NULL) {
-		pixbuf = nautilus_icon_factory_get_pixbuf_for_icon
+		pixbuf = nautilus_icon_factory_get_pixbuf_for_icon_with_stock_size
 			(emblem_icons->data, NULL,
-			 NAUTILUS_ICON_SIZE_FOR_MENUS,
+			 GTK_ICON_SIZE_MENU,
 			 NULL, NULL, FALSE, NULL);
 	} else {
 		pixbuf = NULL;
