AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Stop checking GtkSettings:gtk-enable-mnemonics

Browse Source
This commit is contained in:
Timm Bäder 2016-10-12 21:56:23 +02:00 committed by Benjamin Otte
parent dd3c3b683f
commit a9367b705e
3 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtklabel.c
View File

@ -2015,9 +2015,6 @@ gtk_label_screen_changed (GtkWidget *widget,
if (! shortcuts_connected) if (! shortcuts_connected)
{ {
g_signal_connect (settings, "notify::gtk-enable-mnemonics",
G_CALLBACK (label_shortcut_setting_changed),
NULL);
g_signal_connect (settings, "notify::gtk-enable-accels", g_signal_connect (settings, "notify::gtk-enable-accels",
G_CALLBACK (label_shortcut_setting_changed), G_CALLBACK (label_shortcut_setting_changed),
NULL); NULL);
@ -2684,10 +2681,6 @@ gtk_label_set_markup_internal (GtkLabel *label,
gboolean enable_mnemonics = TRUE; gboolean enable_mnemonics = TRUE;
gboolean auto_mnemonics = TRUE; gboolean auto_mnemonics = TRUE;
g_object_get (gtk_widget_get_settings (GTK_WIDGET (label)),
"gtk-enable-mnemonics", &enable_mnemonics,
NULL);
if (!(enable_mnemonics && priv->mnemonics_visible && if (!(enable_mnemonics && priv->mnemonics_visible &&
(!auto_mnemonics || (!auto_mnemonics ||
(gtk_widget_is_sensitive (GTK_WIDGET (label)) && (gtk_widget_is_sensitive (GTK_WIDGET (label)) &&
@ -2906,7 +2899,6 @@ gtk_label_set_pattern_internal (GtkLabel *label,
{ {
GtkLabelPrivate *priv = label->priv; GtkLabelPrivate *priv = label->priv;
PangoAttrList *attrs; PangoAttrList *attrs;
gboolean enable_mnemonics = TRUE;
gboolean auto_mnemonics = TRUE; gboolean auto_mnemonics = TRUE;
if (priv->pattern_set) if (priv->pattern_set)
@ -2914,11 +2906,7 @@ gtk_label_set_pattern_internal (GtkLabel *label,
if (is_mnemonic) if (is_mnemonic)
{ {
g_object_get (gtk_widget_get_settings (GTK_WIDGET (label)), if (priv->mnemonics_visible && pattern &&
"gtk-enable-mnemonics", &enable_mnemonics,
NULL);
if (enable_mnemonics && priv->mnemonics_visible && pattern &&
(!auto_mnemonics || (!auto_mnemonics ||
(gtk_widget_is_sensitive (GTK_WIDGET (label)) && (gtk_widget_is_sensitive (GTK_WIDGET (label)) &&
(!priv->mnemonic_widget || (!priv->mnemonic_widget ||

10
gtk/gtkmenushell.c
View File

@ -940,7 +940,6 @@ gtk_menu_shell_key_press (GtkWidget *widget,
{ {
GtkMenuShell *menu_shell = GTK_MENU_SHELL (widget); GtkMenuShell *menu_shell = GTK_MENU_SHELL (widget);
GtkMenuShellPrivate *priv = menu_shell->priv; GtkMenuShellPrivate *priv = menu_shell->priv;
gboolean enable_mnemonics;
priv->keyboard_mode = TRUE; priv->keyboard_mode = TRUE;
@ -951,14 +950,7 @@ gtk_menu_shell_key_press (GtkWidget *widget,
if (gtk_bindings_activate_event (G_OBJECT (widget), event)) if (gtk_bindings_activate_event (G_OBJECT (widget), event))
return TRUE; return TRUE;
g_object_get (gtk_widget_get_settings (widget), return gtk_menu_shell_activate_mnemonic (menu_shell, event);
"gtk-enable-mnemonics", &enable_mnemonics,
NULL);
if (enable_mnemonics)
return gtk_menu_shell_activate_mnemonic (menu_shell, event);
return FALSE;
} }
static gint static gint

12
gtk/gtkwindow.c
View File

@ -10773,7 +10773,6 @@ gtk_window_activate_key (GtkWindow *window,
GtkKeyHash *key_hash; GtkKeyHash *key_hash;
GtkWindowKeyEntry *found_entry = NULL; GtkWindowKeyEntry *found_entry = NULL;
gboolean enable_accels; gboolean enable_accels;
gboolean enable_mnemonics;
g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE); g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
g_return_val_if_fail (event != NULL, FALSE); g_return_val_if_fail (event != NULL, FALSE);
@ -10790,7 +10789,6 @@ gtk_window_activate_key (GtkWindow *window,
event->group); event->group);
g_object_get (gtk_widget_get_settings (GTK_WIDGET (window)), g_object_get (gtk_widget_get_settings (GTK_WIDGET (window)),
"gtk-enable-mnemonics", &enable_mnemonics,
"gtk-enable-accels", &enable_accels, "gtk-enable-accels", &enable_accels,
NULL); NULL);
@ -10799,11 +10797,8 @@ gtk_window_activate_key (GtkWindow *window,
GtkWindowKeyEntry *entry = tmp_list->data; GtkWindowKeyEntry *entry = tmp_list->data;
if (entry->is_mnemonic) if (entry->is_mnemonic)
{ {
if( enable_mnemonics) found_entry = entry;
{ break;
found_entry = entry;
break;
}
} }
else else
{ {
@ -10821,8 +10816,7 @@ gtk_window_activate_key (GtkWindow *window,
{ {
if (found_entry->is_mnemonic) if (found_entry->is_mnemonic)
{ {
if( enable_mnemonics) return gtk_window_mnemonic_activate (window, found_entry->keyval,
return gtk_window_mnemonic_activate (window, found_entry->keyval,
found_entry->modifiers); found_entry->modifiers);
} }
else else