Revert the GtkSettings::gtk-toolbar-icon-size part of the previous change,

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.


svn path=/trunk/; revision=21633
This commit is contained in:
Matthias Clasen 2008-10-12 15:27:57 +00:00 committed by Matthias Clasen
parent 4dc4227c70
commit 7f78ec24a8
2 changed files with 13 additions and 6 deletions

View File

@ -1,3 +1,10 @@
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

View File

@ -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);