]> Pileus Git - ~andy/gtk/commitdiff
Fix a crash in menu code
authorChristian Persch <chpe@gnome.org>
Mon, 4 Oct 2010 14:36:43 +0000 (10:36 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Mon, 4 Oct 2010 14:36:43 +0000 (10:36 -0400)
https://bugzilla.gnome.org/show_bug.cgi?id=631311

gtk/gtkmenu.c

index d0c033868fc972a574b7250fc9d1ba12897f89f0..dbbf311753a26bdb8907196217bda0d7e582fe0d 100644 (file)
@@ -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)
     {