summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--gtk/gtktoolbar.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0de9e60913..d912ba4c39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-21 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtktoolbar.c: Fix the default value of the toolbar-style
+ property. (#489782, Jan Janech)
+
2007-11-20 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkimage.c (animation_timeout): Avoid drawing one too many
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 0d2fe327de..6ed46b9aca 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -484,7 +484,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
P_("Toolbar Style"),
P_("How to draw the toolbar"),
GTK_TYPE_TOOLBAR_STYLE,
- GTK_TOOLBAR_ICONS,
+ DEFAULT_TOOLBAR_STYLE,
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_SHOW_ARROW,