Complete the fix for #165770, Vincent Untz:

2005-02-11  Matthias Clasen  <mclasen@redhat.com>

	Complete the fix for #165770, Vincent Untz:

	* gtk/gtkfilechooserbutton.c (FALLBACK_ICON_SIZE): Make the
	fallback size be 16, to be equal to the default for
	GTK_ICON_SIZE_MENU (in gtkiconfactory.c:init_icon_sizes()).
	(gtk_file_chooser_button_init):
	(change_icon_theme): Use GTK_ICON_SIZE_MENU instead of
	GTK_ICON_SIZE_SMALL_TOOLBAR.

diff --git a/ChangeLog b/ChangeLog
index 4b6d11cb1ae89c555a99f2629d7b27cf11fc0a27..c3303544dcd3d526cce3775f4c71dd962edf2c2e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-02-11  Matthias Clasen  <mclasen@redhat.com>
+
+       Complete the fix for #165770, Vincent Untz:
+       
+       * gtk/gtkfilechooserbutton.c (FALLBACK_ICON_SIZE): Make the
+       fallback size be 16, to be equal to the default for
+       GTK_ICON_SIZE_MENU (in gtkiconfactory.c:init_icon_sizes()).
+       (gtk_file_chooser_button_init):
+       (change_icon_theme): Use GTK_ICON_SIZE_MENU instead of
+       GTK_ICON_SIZE_SMALL_TOOLBAR. 
+
 2005-02-09  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): Fix RTL

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4b6d11cb1ae89c555a99f2629d7b27cf11fc0a27..c3303544dcd3d526cce3775f4c71dd962edf2c2e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+2005-02-11  Matthias Clasen  <mclasen@redhat.com>
+
+       Complete the fix for #165770, Vincent Untz:
+       
+       * gtk/gtkfilechooserbutton.c (FALLBACK_ICON_SIZE): Make the
+       fallback size be 16, to be equal to the default for
+       GTK_ICON_SIZE_MENU (in gtkiconfactory.c:init_icon_sizes()).
+       (gtk_file_chooser_button_init):
+       (change_icon_theme): Use GTK_ICON_SIZE_MENU instead of
+       GTK_ICON_SIZE_SMALL_TOOLBAR. 
+
 2005-02-09  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): Fix RTL

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4b6d11cb1ae89c555a99f2629d7b27cf11fc0a27..c3303544dcd3d526cce3775f4c71dd962edf2c2e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+2005-02-11  Matthias Clasen  <mclasen@redhat.com>
+
+       Complete the fix for #165770, Vincent Untz:
+       
+       * gtk/gtkfilechooserbutton.c (FALLBACK_ICON_SIZE): Make the
+       fallback size be 16, to be equal to the default for
+       GTK_ICON_SIZE_MENU (in gtkiconfactory.c:init_icon_sizes()).
+       (gtk_file_chooser_button_init):
+       (change_icon_theme): Use GTK_ICON_SIZE_MENU instead of
+       GTK_ICON_SIZE_SMALL_TOOLBAR. 
+
 2005-02-09  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): Fix RTL

diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 46d8ccff176cde331102aafb2c982ce472e3adf4..eb7815e0c4c4a3d7abeadbe1bc5689a0b4cc2e94 100644 (file)
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -67,7 +67,7 @@
 #define DESKTOP_DISPLAY_NAME   N_("Desktop")
 #define FALLBACK_DISPLAY_NAME  N_("(None)")
 #define FALLBACK_ICON_NAME     "stock_unknown"
-#define FALLBACK_ICON_SIZE     20
+#define FALLBACK_ICON_SIZE     16
 
 
 /* ********************** *
@@ -413,7 +413,7 @@ gtk_file_chooser_button_init (GtkFileChooserButton *button)
   gtk_widget_show (sep);
 
   image = gtk_image_new_from_stock (GTK_STOCK_OPEN,
-                                   GTK_ICON_SIZE_SMALL_TOOLBAR);
+                                   GTK_ICON_SIZE_MENU);
   gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 0);
   gtk_widget_show (image);
 
@@ -1043,7 +1043,7 @@ change_icon_theme (GtkFileChooserButton *button)
 
   settings = gtk_settings_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (button)));
 
-  if (gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_SMALL_TOOLBAR,
+  if (gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU,
                                         &width, &height))
     priv->icon_size = MAX (width, height);
   else