diff options
author | Björn Lindqvist <bjourne@gmail.com> | 2008-08-18 17:48:13 +0000 |
---|---|---|
committer | Björn Lindqvist <bjornl@src.gnome.org> | 2008-08-18 17:48:13 +0000 |
commit | 7df6b76a1a3acbe9744fb77df1d614463f07f0bf (patch) | |
tree | 3c179a703489617dbde2139c44deb74697846905 | |
parent | 3f5d891403b027d412fc2b04d938eb9fbae9a98e (diff) | |
download | gdk-pixbuf-7df6b76a1a3acbe9744fb77df1d614463f07f0bf.tar.gz |
Bug 541315 – Segfault when selecting a GtkMenuItem with submenu and no
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.
svn path=/trunk/; revision=21149
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | gtk/gtkmenuitem.c | 2 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,11 @@ +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. + 2008-08-18 Johan Dahlin <johan@gnome.org> Bug 548196 – gtk-builder-convert doesn't properly convert GtkTextView diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index a7256af11..b8fae7614 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -1137,7 +1137,7 @@ gtk_menu_item_real_popup_submenu (GtkWidget *widget, { 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; |