[gnome-shell] Handle 'switch-input-source' keybinding move
- From: Rui Matos <rtcm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] Handle 'switch-input-source' keybinding move
- Date: Tue, 18 Dec 2012 17:03:00 +0000 (UTC)
commit 07511cb21a6eb3382fa191064aac983b861db041
Author: Rui Matos <tiagomatos gmail com>
Date: Tue Dec 18 15:04:14 2012 +0000
Handle 'switch-input-source' keybinding move
Moving this to gsettings-desktop-schemas instead so that
gnome-control-center doesn't have to grow a dependency on gnome-shell.
https://bugzilla.gnome.org/show_bug.cgi?id=690427
data/50-gnome-shell-typing.xml.in | 15 ---------------
data/Makefile.am | 1 -
data/org.gnome.shell.gschema.xml.in.in | 10 ----------
js/ui/status/keyboard.js | 4 ++--
4 files changed, 2 insertions(+), 28 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index be6deef..f3e90b0 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -54,7 +54,6 @@ keysdir = @GNOME_KEYBINDINGS_KEYSDIR@
keys_in_files = \
50-gnome-shell-screenshot.xml.in \
50-gnome-shell-system.xml.in \
- 50-gnome-shell-typing.xml.in \
$(NULL)
keys_DATA = $(keys_in_files:.xml.in=.xml)
diff --git a/data/org.gnome.shell.gschema.xml.in.in b/data/org.gnome.shell.gschema.xml.in.in
index 313aea0..24af093 100644
--- a/data/org.gnome.shell.gschema.xml.in.in
+++ b/data/org.gnome.shell.gschema.xml.in.in
@@ -135,16 +135,6 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
Keybinding to start/stop the builtin screen recorder.
</_description>
</key>
- <key name="switch-input-source" type="as">
- <default>["<Super>space"]</default>
- <_summary>Switch input source</_summary>
- <_description>Binding to select the next input source</_description>
- </key>
- <key name="switch-input-source-backward" type="as">
- <default>[]</default>
- <_summary>Switch input source backward</_summary>
- <_description>Binding to select the previous input source</_description>
- </key>
</schema>
<schema id="org.gnome.shell.keyboard" path="/org/gnome/shell/keyboard/"
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index 7959e64..c1b4ea1 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -330,13 +330,13 @@ const InputSourceIndicator = new Lang.Class({
this._mruSources = [];
this._keybindingAction =
Main.wm.addKeybinding('switch-input-source',
- new Gio.Settings({ schema: "org.gnome.shell.keybindings" }),
+ new Gio.Settings({ schema: "org.gnome.desktop.wm.keybindings" }),
Meta.KeyBindingFlags.REVERSES,
Main.KeybindingMode.ALL,
Lang.bind(this, this._switchInputSource));
this._keybindingActionBackward =
Main.wm.addKeybinding('switch-input-source-backward',
- new Gio.Settings({ schema: "org.gnome.shell.keybindings" }),
+ new Gio.Settings({ schema: "org.gnome.desktop.wm.keybindings" }),
Meta.KeyBindingFlags.REVERSES |
Meta.KeyBindingFlags.REVERSED,
Main.KeybindingMode.ALL,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]