? autom4te.cache
? depcomp
? eog.desktop.in
? install-sh
? missing
? mkinstalldirs
? omf.make
? stamp-h1
? xmldocs.make
? art/stock-rotate-270-24.png
? art/stock-rotate-90-24.png
? help/C/eog-C.omf.out
? help/de/eog-de.omf.out
? help/es/eog-es.omf.out
? help/eu/Makefile
? help/eu/Makefile.in
? help/eu/eog-eu.omf.out
? help/eu/omf_timestamp
? help/fr/eog-fr.omf.out
? help/it/eog-it.omf.out
? help/ja/eog-ja.omf.out
? help/ko/eog-ko.omf.out
? help/sv/eog-sv.omf.out
? help/zh_CN/eog-zh_CN.omf.out
? help/zh_TW/eog-zh_TW.omf.out
? libeog/test-eog-job
? libeog/test-image-load
Index: art/Makefile.am
===================================================================
RCS file: /cvs/gnome/eog/art/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- art/Makefile.am	2 Jun 2004 05:44:52 -0000	1.4
+++ art/Makefile.am	5 Jun 2005 15:30:10 -0000
@@ -9,6 +9,8 @@
 	stock-flip-vertical-16.png \
 	stock-rotate-90-16.png	\
 	stock-rotate-270-16.png	\
+	stock-rotate-90-24.png	\
+	stock-rotate-270-24.png	\
 	stock-rotate-180-16.png \
 	loading.png
 
Index: shell/eog-window.c
===================================================================
RCS file: /cvs/gnome/eog/shell/eog-window.c,v
retrieving revision 1.132
diff -u -r1.132 eog-window.c
--- shell/eog-window.c	12 Apr 2005 05:26:29 -0000	1.132
+++ shell/eog-window.c	5 Jun 2005 15:30:12 -0000
@@ -2811,54 +2811,84 @@
 
 typedef struct {
 	char *stock_id;
-	char *path;
+	char *file_icon_16;
+	char *file_icon_24;
 } 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 }
+	{ EOG_STOCK_ROTATE_90, "eog/stock-rotate-90-16.png", "eog/stock-rotate-90-24.png" },
+	{ EOG_STOCK_ROTATE_180, "eog/stock-rotate-180-16.png", NULL},
+	{ EOG_STOCK_ROTATE_270, "eog/stock-rotate-270-16.png", "eog/stock-rotate-270-24.png" },
+	{ EOG_STOCK_FLIP_VERTICAL, "eog/stock-flip-vertical-16.png", NULL },
+	{ EOG_STOCK_FLIP_HORIZONTAL, "eog/stock-flip-horizontal-16.png", NULL }
 };
 
 static void
 add_eog_icon_factory (void)
 {
-	GdkPixbuf *pixbuf;
 	GtkIconFactory *factory;
-	GtkIconSet *set;
-	int i = 0; 
+	int i; 
 	GnomeProgram *program;
 
 	factory = gtk_icon_factory_new ();
 	program = gnome_program_get (); /* don't free this it's static */
 	g_assert (program != NULL);
 
-	while (eog_stock_items[i].stock_id != NULL) {
+	for (i = 0; i < G_N_ELEMENTS (eog_stock_items); i++) {
 		EogStockItems item;
 		char *filepath;
+		GtkIconSet *set;
+		GdkPixbuf *pixbuf;
+		GtkIconSource *source;
+
+		set = gtk_icon_set_new ();
+		source = gtk_icon_source_new ();
 
-		item = eog_stock_items[i++];
+		item = eog_stock_items[i];
 		
-		filepath = gnome_program_locate_file (program,
-						      GNOME_FILE_DOMAIN_APP_PIXMAP,
-						      item.path,
-						      FALSE, NULL);
-		if (filepath != NULL) {
-			pixbuf = gdk_pixbuf_new_from_file (filepath, NULL);
-			
-			if (pixbuf != NULL) {
-				set = gtk_icon_set_new_from_pixbuf (pixbuf);
-				gtk_icon_factory_add (factory, item.stock_id, set);
+		/* icons of size 16 */
+		if (item.file_icon_16 != NULL) {
+			filepath = gnome_program_locate_file (program,
+						      	      GNOME_FILE_DOMAIN_APP_PIXMAP,
+						      	      item.file_icon_16,
+						      	      FALSE, NULL);
+			if (filepath != NULL) {
+				pixbuf = gdk_pixbuf_new_from_file (filepath, NULL);
 				
-				gtk_icon_set_unref (set);
-				gdk_pixbuf_unref (pixbuf);
+				if (pixbuf != NULL) {
+					gtk_icon_source_set_pixbuf (source, pixbuf);
+					gtk_icon_source_set_size_wildcarded (source, FALSE);
+					gtk_icon_source_set_size (source, GTK_ICON_SIZE_MENU);
+					gtk_icon_set_add_source (set, source);
+					g_object_unref (pixbuf);
+				}			
+				g_free (filepath);
 			}
-			
-			g_free (filepath);
 		}
+
+		/* icons of size 24 */
+		if (item.file_icon_24 != NULL) {
+			filepath = gnome_program_locate_file (program,
+							      GNOME_FILE_DOMAIN_APP_PIXMAP,
+							      item.file_icon_24,
+							      FALSE, NULL);
+			if (filepath != NULL) {
+				pixbuf = gdk_pixbuf_new_from_file (filepath, NULL);
+				
+				if (pixbuf != NULL) {
+					gtk_icon_source_set_pixbuf (source, pixbuf);
+					gtk_icon_source_set_size_wildcarded (source, FALSE);
+					gtk_icon_source_set_size (source, GTK_ICON_SIZE_LARGE_TOOLBAR);
+					gtk_icon_set_add_source (set, source);
+					g_object_unref (pixbuf);
+				}			
+				g_free (filepath);
+			}
+		}
+
+		gtk_icon_factory_add (factory, item.stock_id, set);
+		gtk_icon_set_unref (set);
+		gtk_icon_source_free (source);
 	}
 
 	gtk_icon_factory_add_default (factory);
