diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2013-09-23 13:01:49 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2014-03-03 18:58:26 -0500 |
| commit | ba0542dc51f89a0df0b42c26eaab530143c0678c (patch) | |
| tree | 2c61983013e0310114045fb20cc7ccbecfbe7bdb /gtk/gtkmenushell.c | |
| parent | c3945d506da5d8aefdb960f4d98cafdb83dc047e (diff) | |
| download | gtk+-ba0542dc51f89a0df0b42c26eaab530143c0678c.tar.gz | |
Allow applications to use gtk-enable-mnemonics in 3.12
gnome-terminal is still using this setting, so we'll let
applications override it for another cycle. It is no longer
backed by a system-wide setting, though, and it will still
go away eventually.
This partically reverts 7e3a494fac62140f466fc43f6cc061215953e9b1
Diffstat (limited to 'gtk/gtkmenushell.c')
| -rw-r--r-- | gtk/gtkmenushell.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index 48a00ea42f..7e2dbe7b36 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -955,6 +955,7 @@ gtk_menu_shell_key_press (GtkWidget *widget, { GtkMenuShell *menu_shell = GTK_MENU_SHELL (widget); GtkMenuShellPrivate *priv = menu_shell->priv; + gboolean enable_mnemonics; priv->keyboard_mode = TRUE; @@ -965,7 +966,14 @@ gtk_menu_shell_key_press (GtkWidget *widget, if (gtk_bindings_activate_event (G_OBJECT (widget), event)) return TRUE; - return gtk_menu_shell_activate_mnemonic (menu_shell, event); + g_object_get (gtk_widget_get_settings (widget), + "gtk-enable-mnemonics", &enable_mnemonics, + NULL); + + if (enable_mnemonics) + return gtk_menu_shell_activate_mnemonic (menu_shell, event); + + return FALSE; } static gint |