diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-11-28 20:00:07 -0500 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-11-28 20:00:07 -0500 |
| commit | 25a8c7316d4acb2fe3ada0bef3c087875bc95e45 (patch) | |
| tree | a96457874533bfbcf4bc1f1ac38b20f33ad64f5e /gtk | |
| parent | 5bf30c2885253f7687c4f7e03e5f9fd2c9d82922 (diff) | |
| download | gtk+-25a8c7316d4acb2fe3ada0bef3c087875bc95e45.tar.gz | |
Bug 601869 - GtkUIManager assumes too much about popup menus
Check that the child of a popup menu item is actually a GtkAccelLabel
before setting its "accel-closure" property.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkuimanager.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index 771252d53c..dff9085509 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -31,6 +31,7 @@ #include "config.h" #include <string.h> +#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); } } |