Deprecate and ignore gtk-enable-mnemonics and gtk-auto-mnemonics" properties

They are both enabled by default.

1 files changed, 1 insertions, 17 deletions

diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 2318a4ea7c..91c93e5cf1 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -945,17 +945,9 @@ void
 _gtk_menu_shell_update_mnemonics (GtkMenuShell *menu_shell)
 {
   GtkMenuShell *target;
-  gboolean auto_mnemonics;
   gboolean found;
   gboolean mnemonics_visible;
 
-  g_object_get (gtk_widget_get_settings (GTK_WIDGET (menu_shell)),
-                "gtk-auto-mnemonics", &auto_mnemonics,
-                NULL);
-
-  if (!auto_mnemonics)
-    return;
-
   target = menu_shell;
   found = FALSE;
   while (target)
@@ -1010,7 +1002,6 @@ 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;
 
@@ -1021,14 +1012,7 @@ gtk_menu_shell_key_press (GtkWidget   *widget,
   if (gtk_bindings_activate_event (G_OBJECT (widget), event))
     return TRUE;
 
-  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;
+  return gtk_menu_shell_activate_mnemonic (menu_shell, event);
 }
 
 static gint