Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Also revert enable-mnemonics code in gtkwindow, which was forgotten in commit 34cf40e95c.

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=708346
This commit is contained in:
Johannes Wellhöfer
2013-10-13 16:15:18 +02:00
committed by Matthias Clasen
parent 9a05e55dfa
commit 46cfebfe97
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkwindow.c
View File

@@ -11800,6 +11800,7 @@ gtk_window_activate_key (GtkWindow *window,
GtkKeyHash *key_hash;
GtkWindowKeyEntry *found_entry = NULL;
gboolean enable_accels;
gboolean enable_mnemonics;
g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@@ -11816,6 +11817,7 @@ gtk_window_activate_key (GtkWindow *window,
event->group);
g_object_get (gtk_widget_get_settings (GTK_WIDGET (window)),
"gtk-enable-mnemonics", &enable_mnemonics,
"gtk-enable-accels", &enable_accels,
NULL);
@@ -11824,8 +11826,11 @@ gtk_window_activate_key (GtkWindow *window,
GtkWindowKeyEntry *entry = tmp_list->data;
if (entry->is_mnemonic)
{
found_entry = entry;
break;
if( enable_mnemonics)
{
found_entry = entry;
break;
}
}
else
{
@@ -11843,7 +11848,8 @@ gtk_window_activate_key (GtkWindow *window,
{
if (found_entry->is_mnemonic)
{
return gtk_window_mnemonic_activate (window, found_entry->keyval,
if( enable_mnemonics)
return gtk_window_mnemonic_activate (window, found_entry->keyval,
found_entry->modifiers);
}
else