summaryrefslogtreecommitdiff
path: root/gtk/gtkmenushell.c
diff options
context:
space:
mode:
authorStéphane Démurget <stephane.demurget@free.fr>2012-12-15 17:21:12 +0100
committerStéphane Démurget <stephane.demurget@free.fr>2012-12-17 16:02:54 +0100
commit531d0dc32a38c3bb00a5f9f6fc37e126f62beb07 (patch)
tree9efa2da9d96e244f2ee49b4a41cd0a6dd5c5f878 /gtk/gtkmenushell.c
parentebf9b9a0e713937e82996f9d4aca8eb3b84bfb30 (diff)
downloadgtk+-531d0dc32a38c3bb00a5f9f6fc37e126f62beb07.tar.gz
gtkmenushell: Fix an endless loop on focus cycle
This is a simple fallout from sealing gtkmenushell, which only appears when F10 or Shift-F10 is used in a submenu. https://bugzilla.gnome.org/show_bug.cgi?id=690266
Diffstat (limited to 'gtk/gtkmenushell.c')
-rw-r--r--gtk/gtkmenushell.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 942c721b9f..81fe3a8e0b 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -1727,8 +1727,8 @@ gtk_real_menu_shell_cycle_focus (GtkMenuShell *menu_shell,
while (menu_shell && !GTK_IS_MENU_BAR (menu_shell))
{
- if (priv->parent_menu_shell)
- menu_shell = GTK_MENU_SHELL (priv->parent_menu_shell);
+ if (menu_shell->priv->parent_menu_shell)
+ menu_shell = GTK_MENU_SHELL (menu_shell->priv->parent_menu_shell);
else
menu_shell = NULL;
}