summaryrefslogtreecommitdiff
path: root/gtk/gtkmenushell.c
diff options
context:
space:
mode:
authorCarlos Soriano <carlos.sorian89@gmail.com>2014-12-03 15:53:59 +0100
committerChristian Hergert <christian@hergert.me>2014-12-08 20:19:33 -0800
commit235837ad4932e60f46db97934be1dfb5200e185e (patch)
treeb7dbf8299c7dad3c0e0ba8982ce4e2d646e560cb /gtk/gtkmenushell.c
parent17fec70022c30695ca9a1cbaab4494f92668a317 (diff)
downloadgtk+-235837ad4932e60f46db97934be1dfb5200e185e.tar.gz
gtkwindow: Use actions from focused widget to activate accel
Currently we only take into account the window GActionGroup for activating the accels. However, the application could have some custom GActionGroup in the chain of focused widgets that could want to activate some action if some accel is activated while that widget is focused. To allow applications to set accels on widgets that use custom GActionGroups, simply use the muxer of the focused widget, which already contains the actions of the parents. https://bugzilla.gnome.org/show_bug.cgi?id=740682
Diffstat (limited to 'gtk/gtkmenushell.c')
-rw-r--r--gtk/gtkmenushell.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index d1d0c7f07b..939d5f4462 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -2194,7 +2194,7 @@ gtk_menu_shell_bind_model (GtkMenuShell *menu_shell,
g_return_if_fail (GTK_IS_MENU_SHELL (menu_shell));
g_return_if_fail (model == NULL || G_IS_MENU_MODEL (model));
- muxer = _gtk_widget_get_action_muxer (GTK_WIDGET (menu_shell));
+ muxer = _gtk_widget_get_action_muxer (GTK_WIDGET (menu_shell), TRUE);
g_clear_pointer (&menu_shell->priv->tracker, gtk_menu_tracker_free);