Add stock file and directory icons in sizes 16 and 24. Do not add the

Thu Jul  8 22:16:18 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkiconfactory.c (get_default_icons):
	* gtk/stock-icons/Makefile.am: Add stock file and
	directory icons in sizes 16 and 24. Do not add the stock ids
	to the gtkstock.h, since they are only for internal use on the
	2.4 branch.

ChangeLog

@@ -1,3 +1,11 @@
+Thu Jul  8 22:16:18 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkiconfactory.c (get_default_icons): 
+	* gtk/stock-icons/Makefile.am: Add stock file and 
+	directory icons in sizes 16 and 24. Do not add the stock ids
+	to the gtkstock.h, since they are only for internal use on the
+	2.4 branch.
+
 2004-07-08  Federico Mena Quintero  <federico@ximian.com>
 
 	Merged from HEAD:

ChangeLog.pre-2-10

@@ -1,3 +1,11 @@
+Thu Jul  8 22:16:18 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkiconfactory.c (get_default_icons): 
+	* gtk/stock-icons/Makefile.am: Add stock file and 
+	directory icons in sizes 16 and 24. Do not add the stock ids
+	to the gtkstock.h, since they are only for internal use on the
+	2.4 branch.
+
 2004-07-08  Federico Mena Quintero  <federico@ximian.com>
 
 	Merged from HEAD:

ChangeLog.pre-2-6

@@ -1,3 +1,11 @@
+Thu Jul  8 22:16:18 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkiconfactory.c (get_default_icons): 
+	* gtk/stock-icons/Makefile.am: Add stock file and 
+	directory icons in sizes 16 and 24. Do not add the stock ids
+	to the gtkstock.h, since they are only for internal use on the
+	2.4 branch.
+
 2004-07-08  Federico Mena Quintero  <federico@ximian.com>
 
 	Merged from HEAD:

ChangeLog.pre-2-8

@@ -1,3 +1,11 @@
+Thu Jul  8 22:16:18 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkiconfactory.c (get_default_icons): 
+	* gtk/stock-icons/Makefile.am: Add stock file and 
+	directory icons in sizes 16 and 24. Do not add the stock ids
+	to the gtkstock.h, since they are only for internal use on the
+	2.4 branch.
+
 2004-07-08  Federico Mena Quintero  <federico@ximian.com>
 
 	Merged from HEAD:

gtk/gtkiconfactory.c

@@ -695,6 +695,14 @@ get_default_icons (GtkIconFactory *factory)
 	     16, stock_up_arrow_16,
 	     24, stock_up_arrow_24);
 
+  add_icon2 (factory, "gtk-file",
+	     16, stock_file_16,
+	     24, stock_file_24);
+
+  add_icon2 (factory, "gtk-directory",
+	     16, stock_directory_16,
+	     24, stock_directory_24);
+
   /* Generic size only */
 
   add_icon (factory, GTK_STOCK_CLEAR, 24, stock_clear_24);

gtk/stock-icons/Makefile.am

@@ -34,6 +34,8 @@ IMAGES = \
 	stock_dialog_info_48.png	\
 	stock_dialog_question_48.png	\
 	stock_dialog_warning_48.png	\
+	stock_directory_16.png		\
+	stock_directory_24.png	 	\
 	stock_dnd_multiple_32.png	\
 	stock_down_arrow_16.png		\
 	stock_down_arrow_24.png 	\
@@ -41,6 +43,8 @@ IMAGES = \
 	stock_exec_24.png 		\
 	stock_exit_16.png		\
 	stock_exit_24.png		\
+	stock_file_16.png		\
+	stock_file_24.png 		\
 	stock_first_16.png		\
 	stock_first_24.png 		\
 	stock_font_16.png		\
@@ -175,6 +179,8 @@ VARIABLES2 = \
 	stock_dialog_info_48   	$(srcdir)/stock_dialog_info_48.png	\
 	stock_dialog_question_48  $(srcdir)/stock_dialog_question_48.png  \
 	stock_dialog_warning_48	$(srcdir)/stock_dialog_warning_48.png	\
+	stock_directory_16	$(srcdir)/stock_directory_16.png	\
+        stock_directory_24	$(srcdir)/stock_directory_24.png	\
 	stock_dnd_32		$(srcdir)/stock_dnd_32.png		\
 	stock_down_arrow_16	$(srcdir)/stock_down_arrow_16.png	\
         stock_down_arrow_24	$(srcdir)/stock_down_arrow_24.png	\
@@ -182,6 +188,8 @@ VARIABLES2 = \
         stock_exec_24		$(srcdir)/stock_exec_24.png            	\
 	stock_exit_16		$(srcdir)/stock_exit_16.png		\
 	stock_exit_24		$(srcdir)/stock_exit_24.png 		\
+	stock_file_16		$(srcdir)/stock_file_16.png		\
+        stock_file_24		$(srcdir)/stock_file_24.png		\
 	stock_first_16		$(srcdir)/stock_first_16.png		\
         stock_first_24		$(srcdir)/stock_first_24.png		\
         stock_font_16		$(srcdir)/stock_font_16.png