Index: art/Makefile.am
===================================================================
RCS file: /cvs/gnome/eog/art/Makefile.am,v
retrieving revision 1.4
diff -n -u -r1.4 Makefile.am
--- art/Makefile.am	2 Jun 2004 05:44:52 -0000	1.4
+++ art/Makefile.am	17 Oct 2006 08:19:36 -0000
@@ -5,10 +5,6 @@
 	orient-vertical.png	\
 	down-right.png		\
 	right-down.png		\
-	stock-flip-horizontal-16.png \
-	stock-flip-vertical-16.png \
-	stock-rotate-90-16.png	\
-	stock-rotate-270-16.png	\
 	stock-rotate-180-16.png \
 	loading.png
 
Index: libeog/eog-collection-item.c
===================================================================
RCS file: /cvs/gnome/eog/libeog/eog-collection-item.c,v
retrieving revision 1.11
diff -n -u -r1.11 eog-collection-item.c
--- libeog/eog-collection-item.c	1 Jun 2006 01:24:47 -0000	1.11
+++ libeog/eog-collection-item.c	17 Oct 2006 08:19:36 -0000
@@ -7,6 +7,7 @@
 #include <libgnomeui/gnome-thumbnail.h>
 #include <libgnomecanvas/libgnomecanvas.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gtk/gtkicontheme.h>
 
 #include "eog-collection-item.h"
 #include "eog-image.h"
@@ -219,20 +220,24 @@
 get_busy_pixbuf (void)
 {
 	static GdkPixbuf *busy = NULL;
+	GError *error = NULL;
 
 	if (busy == NULL) {
-		char *path;
-		char *file;
+	  GtkIconTheme *icon_theme = NULL;
 
-		/* FIXME: we must use a proper initialized GnomeProgramm struct here. */
-		file = g_build_filename ("eog", "loading.png", NULL);
-		path = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_PIXMAP, 
-						  file, TRUE, NULL);
-		
-		busy = gdk_pixbuf_new_from_file (path, NULL);
+	  icon_theme = gtk_icon_theme_get_default ();
+
+	  busy = gtk_icon_theme_load_icon (icon_theme,
+					   "image-loading", /* named icon as in gnome-icon-theme */
+					   48,              /* size */
+					   0,               /* flags */
+					   &error);
+
+	  if (!busy) {
+	    g_warning ("Couldn't load icon: %s", error->message);
+	    g_error_free (error);
+	  }
 
-		g_free (path);
-		g_free (file);
 	}
 
 	g_object_ref (busy);
Index: shell/eog-window.c
===================================================================
RCS file: /cvs/gnome/eog/shell/eog-window.c,v
retrieving revision 1.202
diff -n -u -r1.202 eog-window.c
--- shell/eog-window.c	11 Sep 2006 18:21:05 -0000	1.202
+++ shell/eog-window.c	17 Oct 2006 08:19:40 -0000
@@ -90,11 +90,7 @@
 #define RECENT_FILES_GROUP         "Eye of Gnome"
 #define EOG_WINDOW_DND_POPUP_PATH  "/popups/dragndrop"
 
-#define EOG_STOCK_ROTATE_90    "eog-stock-rotate-90"
-#define EOG_STOCK_ROTATE_270   "eog-stock-rotate-270"
 #define EOG_STOCK_ROTATE_180   "eog-stock-rotate-180"
-#define EOG_STOCK_FLIP_HORIZONTAL "eog-stock-flip-horizontal"
-#define EOG_STOCK_FLIP_VERTICAL   "eog-stock-flip-vertical"
 
 #define NO_DEBUG
 #define NO_SAVE_DEBUG
@@ -3353,11 +3349,7 @@
 } EogStockItems;
 
 static EogStockItems eog_stock_items [] = {
-	{ EOG_STOCK_ROTATE_90, "eog/stock-rotate-90-16.png" },
 	{ EOG_STOCK_ROTATE_180, "eog/stock-rotate-180-16.png" },
-	{ EOG_STOCK_ROTATE_270, "eog/stock-rotate-270-16.png" },
-	{ EOG_STOCK_FLIP_VERTICAL, "eog/stock-flip-vertical-16.png" },
-	{ EOG_STOCK_FLIP_HORIZONTAL, "eog/stock-flip-horizontal-16.png" },
 	{ NULL, NULL }
 };
 
@@ -3434,11 +3426,11 @@
 
   { "EditUndo", NULL, N_("_Undo"), "<control>z", NULL, G_CALLBACK (verb_Undo_cb) },
 
-  { "EditFlipHorizontal", EOG_STOCK_FLIP_HORIZONTAL, N_("Flip _Horizontal"), NULL, NULL, G_CALLBACK (verb_FlipHorizontal_cb) },
-  { "EditFlipVertical", EOG_STOCK_FLIP_VERTICAL, N_("Flip _Vertical"), NULL, NULL, G_CALLBACK (verb_FlipVertical_cb) },
+  { "EditFlipHorizontal", "object-flip-horizontal", N_("Flip _Horizontal"), NULL, NULL, G_CALLBACK (verb_FlipHorizontal_cb) },
+  { "EditFlipVertical", "object-flip-vertical", N_("Flip _Vertical"), NULL, NULL, G_CALLBACK (verb_FlipVertical_cb) },
 
-  { "EditRotate90",  EOG_STOCK_ROTATE_90,  N_("_Rotate Clockwise"), "<control>r", NULL, G_CALLBACK (verb_Rotate90_cb) },
-  { "EditRotate270", EOG_STOCK_ROTATE_270, N_("Rotate Counterc_lockwise"), NULL, NULL, G_CALLBACK (verb_Rotate270_cb) },
+  { "EditRotate90",  "object-rotate-right",  N_("_Rotate Clockwise"), "<control>r", NULL, G_CALLBACK (verb_Rotate90_cb) },
+  { "EditRotate270", "object-rotate-left", N_("Rotate Counterc_lockwise"), NULL, NULL, G_CALLBACK (verb_Rotate270_cb) },
   { "EditRotate180", EOG_STOCK_ROTATE_180, N_("Rotat_e 180\xC2\xB0"), "<control><shift>r", NULL, G_CALLBACK (verb_Rotate180_cb) },
   { "SetAsWallpaper", NULL, N_("Set As _Wallpaper"), NULL, NULL, G_CALLBACK (verb_SetAsWallpaper_cb) },
 
