From e8fa2b641733c6e14c1b4bc02cf871c72cd92778 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Thu, 29 May 2014 23:28:44 +0200 Subject: [PATCH] Stop using Meta.KeyBindingFlags.REVERSES for IM switch keybinding When this flag is set on a MetaKeyBinding, mutter will know that the keybinding has an associated reverse keybinding triggered with the shift modifier. However, an undesirable side-effect is that gnome-control-center keyboard panel does not know that this 'shift' is reserved for these reverse keybindings and cannot detect conflicting bindings in this case. This 'reverse' logic can now be handled at a higher level (in gcc keyboard panel) so this commit removes it from gnome-shell so that they do not conflict. https://bugzilla.gnome.org/show_bug.cgi?id=732296 --- js/ui/status/keyboard.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js index 032b9d529..51b90fa91 100644 --- a/js/ui/status/keyboard.js +++ b/js/ui/status/keyboard.js @@ -366,13 +366,12 @@ const InputSourceIndicator = new Lang.Class({ this._keybindingAction = Main.wm.addKeybinding('switch-input-source', new Gio.Settings({ schema_id: "org.gnome.desktop.wm.keybindings" }), - Meta.KeyBindingFlags.REVERSES, + Meta.KeyBindingFlags.NONE, Shell.KeyBindingMode.ALL, Lang.bind(this, this._switchInputSource)); this._keybindingActionBackward = Main.wm.addKeybinding('switch-input-source-backward', new Gio.Settings({ schema_id: "org.gnome.desktop.wm.keybindings" }), - Meta.KeyBindingFlags.REVERSES | Meta.KeyBindingFlags.IS_REVERSED, Shell.KeyBindingMode.ALL, Lang.bind(this, this._switchInputSource));