Register 16x16 version of properties stock icon.

2002-03-06  Anders Carlsson  <andersca@gnu.org>

	* gtk/gtkiconfactory.c (get_default_icons): Register 16x16 version
	of properties stock icon.

	* gtk/stock-icons/Makefile.am: Add stock_properties_16.png

diff --git a/ChangeLog b/ChangeLog
index 1af13c835531f633770a9022d0caaef90e341aff..234e9e23aa17d00f6e1d291d3a71f4e1f9ea27ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-06  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkiconfactory.c (get_default_icons): Register 16x16 version
+       of properties stock icon.
+
+       * gtk/stock-icons/Makefile.am: Add stock_properties_16.png
+
 Wed Mar  6 00:38:29 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_real_insert_text): Fix various problems

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 1af13c835531f633770a9022d0caaef90e341aff..234e9e23aa17d00f6e1d291d3a71f4e1f9ea27ff 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+2002-03-06  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkiconfactory.c (get_default_icons): Register 16x16 version
+       of properties stock icon.
+
+       * gtk/stock-icons/Makefile.am: Add stock_properties_16.png
+
 Wed Mar  6 00:38:29 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_real_insert_text): Fix various problems

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1af13c835531f633770a9022d0caaef90e341aff..234e9e23aa17d00f6e1d291d3a71f4e1f9ea27ff 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2002-03-06  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkiconfactory.c (get_default_icons): Register 16x16 version
+       of properties stock icon.
+
+       * gtk/stock-icons/Makefile.am: Add stock_properties_16.png
+
 Wed Mar  6 00:38:29 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_real_insert_text): Fix various problems

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1af13c835531f633770a9022d0caaef90e341aff..234e9e23aa17d00f6e1d291d3a71f4e1f9ea27ff 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+2002-03-06  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkiconfactory.c (get_default_icons): Register 16x16 version
+       of properties stock icon.
+
+       * gtk/stock-icons/Makefile.am: Add stock_properties_16.png
+
 Wed Mar  6 00:38:29 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_real_insert_text): Fix various problems

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1af13c835531f633770a9022d0caaef90e341aff..234e9e23aa17d00f6e1d291d3a71f4e1f9ea27ff 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2002-03-06  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkiconfactory.c (get_default_icons): Register 16x16 version
+       of properties stock icon.
+
+       * gtk/stock-icons/Makefile.am: Add stock_properties_16.png
+
 Wed Mar  6 00:38:29 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_real_insert_text): Fix various problems

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1af13c835531f633770a9022d0caaef90e341aff..234e9e23aa17d00f6e1d291d3a71f4e1f9ea27ff 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2002-03-06  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkiconfactory.c (get_default_icons): Register 16x16 version
+       of properties stock icon.
+
+       * gtk/stock-icons/Makefile.am: Add stock_properties_16.png
+
 Wed Mar  6 00:38:29 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_real_insert_text): Fix various problems

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1af13c835531f633770a9022d0caaef90e341aff..234e9e23aa17d00f6e1d291d3a71f4e1f9ea27ff 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2002-03-06  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtkiconfactory.c (get_default_icons): Register 16x16 version
+       of properties stock icon.
+
+       * gtk/stock-icons/Makefile.am: Add stock_properties_16.png
+
 Wed Mar  6 00:38:29 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_real_insert_text): Fix various problems

diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 79eda20e10f1012cb169cc224b34f928cef443f0..528eb4b8e59a8f28ba89a697e40c6256efa10de1 100644 (file)
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -638,6 +638,12 @@ get_default_icons (GtkIconFactory *factory)
                            GTK_ICON_SIZE_MENU,
                            GTK_STOCK_PRINT_PREVIEW);
 
+  add_sized_with_fallback (factory,
+                          stock_properties_24,
+                          stock_properties_16,
+                          GTK_ICON_SIZE_MENU,
+                          GTK_STOCK_PROPERTIES);
+  
   add_sized_with_fallback (factory,
                            stock_redo_24,
                            stock_redo_16,
@@ -776,7 +782,6 @@ get_default_icons (GtkIconFactory *factory)
   add_unsized (factory, stock_clear_24, GTK_STOCK_CLEAR);
   add_unsized (factory, stock_colorselector_24, GTK_STOCK_SELECT_COLOR);
   add_unsized (factory, stock_index_24, GTK_STOCK_INDEX);
-  add_unsized (factory, stock_properties_24, GTK_STOCK_PROPERTIES);
   add_unsized (factory, stock_remove_24, GTK_STOCK_REMOVE);
   add_unsized (factory, stock_zoom_1_24, GTK_STOCK_ZOOM_100);
   add_unsized (factory, stock_zoom_fit_24, GTK_STOCK_ZOOM_FIT);

diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am
index abc3c321334c92ecc11f5bd24be36334e14b8d64..d4f266ef68c726d3132e21594356215b98a96358 100644 (file)
--- a/gtk/stock-icons/Makefile.am
+++ b/gtk/stock-icons/Makefile.am
@@ -67,6 +67,7 @@ IMAGES = @STRIP_BEGIN@                        \
        stock_print_24.png              \
        stock_print_preview_16.png      \
        stock_print_preview_24.png      \
+       stock_properties_16.png         \
        stock_properties_24.png         \
        stock_redo_16.png               \
        stock_redo_24.png               \
@@ -193,6 +194,7 @@ VARIABLES4 = @STRIP_BEGIN@                                                                  \
                 stock_print_24                 $(srcdir)/stock_print_24.png                    \
                 stock_print_preview_16         $(srcdir)/stock_print_preview_16.png            \
                 stock_print_preview_24         $(srcdir)/stock_print_preview_24.png            \
+               stock_properties_16             $(srcdir)/stock_properties_16.png               \
                 stock_properties_24            $(srcdir)/stock_properties_24.png               \
                stock_redo_16                   $(srcdir)/stock_redo_16.png                     \
                 stock_redo_24                  $(srcdir)/stock_redo_24.png                     \
@@ -204,9 +206,9 @@ VARIABLES4 = @STRIP_BEGIN@                                                                  \
                stock_right_arrow_16            $(srcdir)/stock_right_arrow_16.png              \
                 stock_right_arrow_24           $(srcdir)/stock_right_arrow_24.png              \
                stock_save_16                   $(srcdir)/stock_save_16.png                     \
-               stock_save_24                   $(srcdir)/stock_save_24.png                     \
 @STRIP_END@
 VARIABLES5 = @STRIP_BEGIN@                                                                     \
+               stock_save_24                   $(srcdir)/stock_save_24.png                     \
                stock_save_as_16                $(srcdir)/stock_save_as_16.png                  \
                 stock_save_as_24               $(srcdir)/stock_save_as_24.png                  \
                stock_search_16                 $(srcdir)/stock_search_16.png                   \
@@ -226,9 +228,9 @@ VARIABLES5 = @STRIP_BEGIN@                                                                  \
                stock_text_italic_16            $(srcdir)/stock_text_italic_16.png              \
                 stock_text_italic_24           $(srcdir)/stock_text_italic_24.png              \
                stock_text_strikethrough_16     $(srcdir)/stock_text_strikethrough_16.png       \
-                stock_text_strikethrough_24    $(srcdir)/stock_text_strikethrough_24.png       \
 @STRIP_END@
 VARIABLES6 = @STRIP_BEGIN@                                                                     \
+                stock_text_strikethrough_24    $(srcdir)/stock_text_strikethrough_24.png       \
                stock_text_underline_16         $(srcdir)/stock_text_underline_16.png           \
                 stock_text_underline_24                $(srcdir)/stock_text_underline_24.png           \
                 stock_top_16                   $(srcdir)/stock_top_16.png                      \