gtk+ r21633 - in trunk: . gtk

[matthiasc svn gnome org]

Author: matthiasc
Date: Sun Oct 12 15:27:57 2008
New Revision: 21633
URL: http://svn.gnome.org/viewvc/gtk+?rev=21633&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtktoolbar.c

Modified: trunk/gtk/gtktoolbar.c
==============================================================================
--- trunk/gtk/gtktoolbar.c	(original)
+++ trunk/gtk/gtktoolbar.c	Sun Oct 12 15:27:57 2008
@@ -640,12 +640,12 @@
                                                     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);