gtk+ r21149 - in trunk: . gtk

[bjornl svn gnome org]

Author: bjornl
Date: Mon Aug 18 17:48:13 2008
New Revision: 21149
URL: http://svn.gnome.org/viewvc/gtk+?rev=21149&view=rev

Log:
2008-08-18  BjÃrn Lindqvist  <bjourne gmail com>

	Bug 541315 â Segfault when selecting a GtkMenuItem with submenu
	and no parent

	* gtk/gtkmenuitem.c (gtk_menu_item_real_popup_submenu): Ensure
	that the menu item has a parent before popping it up.


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

Modified: trunk/gtk/gtkmenuitem.c
==============================================================================
--- trunk/gtk/gtkmenuitem.c	(original)
+++ trunk/gtk/gtkmenuitem.c	Mon Aug 18 17:48:13 2008
@@ -1137,7 +1137,7 @@
 {
   GtkMenuItem *menu_item = GTK_MENU_ITEM (widget);
 
-  if (GTK_WIDGET_IS_SENSITIVE (menu_item->submenu))
+  if (GTK_WIDGET_IS_SENSITIVE (menu_item->submenu) && widget->parent)
     {
       gboolean take_focus;
       GtkMenuPositionFunc menu_position_func;