diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gtk/gtktoolbar.c | 12 |
2 files changed, 13 insertions, 6 deletions
@@ -1,5 +1,12 @@ 2008-10-11 Matthias Clasen <mclasen@redhat.com> + * 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 <mclasen@redhat.com> + Bug 555186 – Setting gtk-toolbar-icon-size with custom icon_size * gtk/gtktoolbar.c: Turn GtkToolbar::icon-size and 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); |