[gnome-control-center] keyboard: Remove additional filtering of default mod mask
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] keyboard: Remove additional filtering of default mod mask
- Date: Thu, 8 Sep 2016 15:41:07 +0000 (UTC)
commit 789639004fad1c45db4f8a43b5d2349663ec0d46
Author: Florian Müllner <fmuellner gnome org>
Date: Thu Sep 8 14:49:03 2016 +0200
keyboard: Remove additional filtering of default mod mask
The mask returned by gtk_accelerator_get_default_mod_mask() should
work without additional filtering, in particular when it is overly
restrictive - a lot of shortcuts use the Super modifier nowadays,
so stop filtering it out.
https://bugzilla.gnome.org/show_bug.cgi?id=771058
panels/keyboard/cc-keyboard-shortcut-editor.c | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/panels/keyboard/cc-keyboard-shortcut-editor.c b/panels/keyboard/cc-keyboard-shortcut-editor.c
index 90063f1..7e2ab43 100644
--- a/panels/keyboard/cc-keyboard-shortcut-editor.c
+++ b/panels/keyboard/cc-keyboard-shortcut-editor.c
@@ -24,11 +24,6 @@
#include "cc-keyboard-shortcut-editor.h"
#include "keyboard-shortcuts.h"
-/*
- * Workaround to stop receiving a stray Meta modifier.
- */
-#define ALL_ACCELS_MASK (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK)
-
struct _CcKeyboardShortcutEditor
{
GtkDialog parent;
@@ -646,7 +641,7 @@ cc_keyboard_shortcut_editor_key_press_event (GtkWidget *widget,
if (!editing)
return GTK_WIDGET_CLASS (cc_keyboard_shortcut_editor_parent_class)->key_press_event (widget, event);
- real_mask = event->state & gtk_accelerator_get_default_mod_mask () & ALL_ACCELS_MASK;
+ real_mask = event->state & gtk_accelerator_get_default_mod_mask ();
/* A single Escape press cancels the editing */
if (!event->is_modifier && real_mask == 0 && event->keyval == GDK_KEY_Escape)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]