Commit 224c47a9 authored by Federico Mena Quintero's avatar Federico Mena Quintero Committed by Federico Mena Quintero

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.
parent 1d0c7ea1
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> 2005-02-01 Matthias Clasen <mclasen@redhat.com>
* */*.c: Fix many instances of "the the" in docs and * */*.c: Fix many instances of "the the" in docs and
......
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> 2005-02-01 Matthias Clasen <mclasen@redhat.com>
* */*.c: Fix many instances of "the the" in docs and * */*.c: Fix many instances of "the the" in docs and
......
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> 2005-02-01 Matthias Clasen <mclasen@redhat.com>
* */*.c: Fix many instances of "the the" in docs and * */*.c: Fix many instances of "the the" in docs and
......
...@@ -273,7 +273,7 @@ typedef enum { ...@@ -273,7 +273,7 @@ typedef enum {
} ShortcutsIndex; } ShortcutsIndex;
/* Icon size for if we can't get it from the theme */ /* 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 PREVIEW_HBOX_SPACING 12
#define NUM_LINES 40 #define NUM_LINES 40
...@@ -4061,7 +4061,7 @@ change_icon_theme (GtkFileChooserDefault *impl) ...@@ -4061,7 +4061,7 @@ change_icon_theme (GtkFileChooserDefault *impl)
settings = gtk_settings_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (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); impl->icon_size = MAX (width, height);
else else
impl->icon_size = FALLBACK_ICON_SIZE; impl->icon_size = FALLBACK_ICON_SIZE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment