summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Persch <chpe@gnome.org>2010-10-04 10:36:43 -0400
committerMatthias Clasen <mclasen@redhat.com>2010-10-04 10:36:43 -0400
commitf0039aa2a4367df95bda1b6cf3d4a735cafb4eb2 (patch)
treea9b7ce6803d7c4e3a1c5c4c35b27748b61f7eb4e
parent21eae6b6f385f64ebea0f4494a14bfd114050f66 (diff)
downloadgtk+-f0039aa2a4367df95bda1b6cf3d4a735cafb4eb2.tar.gz
Fix a crash in menu code
https://bugzilla.gnome.org/show_bug.cgi?id=631311
-rw-r--r--gtk/gtkmenu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index d0c033868f..dbbf311753 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -5474,7 +5474,7 @@ get_menu_height (GtkMenu *menu)
gtk_widget_get_allocation (widget, &allocation);
height = allocation.height;
- height -= gtk_container_get_border_width (GTK_CONTAINER (widget) + gtk_widget_get_style (widget)->ythickness) * 2;
+ height -= gtk_container_get_border_width (GTK_CONTAINER (widget)) + gtk_widget_get_style (widget)->ythickness * 2;
if (!menu->tearoff_active)
{