From 7f78ec24a86f7d130c8227d9584150efe50485f0 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 12 Oct 2008 15:27:57 +0000 Subject: [PATCH] Revert the GtkSettings::gtk-toolbar-icon-size part of the previous change, 2008-10-11 Matthias Clasen * gtk/gtktoolbar.c: Revert the GtkSettings::gtk-toolbar-icon-size part of the previous change, since it doesn't work correctly without extra complication, and using custom icon sizes doesn't make too much sense in a desktop-wide setting. svn path=/trunk/; revision=21633 --- ChangeLog | 7 +++++++ gtk/gtktoolbar.c | 12 ++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5743a38837..a34d4a27b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-10-11 Matthias Clasen + + * gtk/gtktoolbar.c: Revert the GtkSettings::gtk-toolbar-icon-size + part of the previous change, since it doesn't work correctly without + extra complication, and using custom icon sizes doesn't make too + much sense in a desktop-wide setting. + 2008-10-11 Matthias Clasen Bug 555186 – Setting gtk-toolbar-icon-size with custom icon_size diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index ad046e3331..5844e47a61 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -640,12 +640,12 @@ gtk_toolbar_class_init (GtkToolbarClass *klass) DEFAULT_TOOLBAR_STYLE, GTK_PARAM_READWRITE)); - gtk_settings_install_property (g_param_spec_int ("gtk-toolbar-icon-size", - P_("Toolbar icon size"), - P_("Size of icons in default toolbars"), - 0, G_MAXINT, - DEFAULT_ICON_SIZE, - GTK_PARAM_READWRITE)); + gtk_settings_install_property (g_param_spec_enum ("gtk-toolbar-icon-size", + P_("Toolbar icon size"), + P_("Size of icons in default toolbars"), + GTK_TYPE_ICON_SIZE, + DEFAULT_ICON_SIZE, + GTK_PARAM_READWRITE)); binding_set = gtk_binding_set_by_class (klass);