From 25a8c7316d4acb2fe3ada0bef3c087875bc95e45 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 28 Nov 2009 20:00:07 -0500 Subject: [PATCH] =?UTF-8?q?Bug=C2=A0601869=20-=20GtkUIManager=20assumes=20?= =?UTF-8?q?too=20much=20about=20popup=20menus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Check that the child of a popup menu item is actually a GtkAccelLabel before setting its "accel-closure" property. --- gtk/gtkuimanager.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index 771252d53..dff908550 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -31,6 +31,7 @@ #include "config.h" #include +#include "gtkaccellabel.h" #include "gtkactivatable.h" #include "gtkbuildable.h" #include "gtkimagemenuitem.h" @@ -2615,8 +2616,9 @@ update_node (GtkUIManager *self, if (in_popup && !popup_accels) { /* don't show accels in popups */ - GtkWidget *label = GTK_BIN (info->proxy)->child; - g_object_set (label, "accel-closure", NULL, NULL); + GtkWidget *child = gtk_bin_get_child (GTK_BIN (info->proxy)); + if (GTK_IS_ACCEL_LABEL (child)) + g_object_set (child, "accel-closure", NULL, NULL); } }