Merged from gtk-2-6:

2005-02-01  Federico Mena Quintero  <federico@ximian.com>

	Merged from gtk-2-6:

	Fix #165770:

	* gtk/gtkfilechooserdefault.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()).
	(change_icon_theme): Use GTK_ICON_SIZE_MENU instead of
	GTK_ICON_SIZE_SMALL_TOOLBAR.

diff --git a/ChangeLog b/ChangeLog
index c32a00e651dcbcf6101bcd5f7efce1470e0db542..260284db9d003738373c0810617695cee2b25d35 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-02-01  Federico Mena Quintero  <federico@ximian.com>
+
+       Merged from gtk-2-6:
+
+       Fix #165770:
+
+       * gtk/gtkfilechooserdefault.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()).
+       (change_icon_theme): Use GTK_ICON_SIZE_MENU instead of
+       GTK_ICON_SIZE_SMALL_TOOLBAR.
+
 2005-02-01  Matthias Clasen  <mclasen@redhat.com>
 
        * */*.c: Fix many instances of "the the" in docs and

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c32a00e651dcbcf6101bcd5f7efce1470e0db542..260284db9d003738373c0810617695cee2b25d35 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+2005-02-01  Federico Mena Quintero  <federico@ximian.com>
+
+       Merged from gtk-2-6:
+
+       Fix #165770:
+
+       * gtk/gtkfilechooserdefault.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()).
+       (change_icon_theme): Use GTK_ICON_SIZE_MENU instead of
+       GTK_ICON_SIZE_SMALL_TOOLBAR.
+
 2005-02-01  Matthias Clasen  <mclasen@redhat.com>
 
        * */*.c: Fix many instances of "the the" in docs and

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c32a00e651dcbcf6101bcd5f7efce1470e0db542..260284db9d003738373c0810617695cee2b25d35 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,15 @@
+2005-02-01  Federico Mena Quintero  <federico@ximian.com>
+
+       Merged from gtk-2-6:
+
+       Fix #165770:
+
+       * gtk/gtkfilechooserdefault.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()).
+       (change_icon_theme): Use GTK_ICON_SIZE_MENU instead of
+       GTK_ICON_SIZE_SMALL_TOOLBAR.
+
 2005-02-01  Matthias Clasen  <mclasen@redhat.com>
 
        * */*.c: Fix many instances of "the the" in docs and

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 77a14c4c137228896ce780838e512dbe8fd9c622..e55998dc9e8dc77522f62af32df82cae132647ed 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -273,7 +273,7 @@ typedef enum {
 } ShortcutsIndex;
 
 /* Icon size for if we can't get it from the theme */
-#define FALLBACK_ICON_SIZE 20
+#define FALLBACK_ICON_SIZE 16
 
 #define PREVIEW_HBOX_SPACING 12
 #define NUM_LINES 40
@@ -4061,7 +4061,7 @@ change_icon_theme (GtkFileChooserDefault *impl)
 
   settings = gtk_settings_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (impl)));
 
-  if (gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_SMALL_TOOLBAR, &width, &height))
+  if (gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, &width, &height))
     impl->icon_size = MAX (width, height);
   else
     impl->icon_size = FALLBACK_ICON_SIZE;