[gnome-control-center] keyboard: Use GSettings for those shortcuts

[Bastien Nocera <hadess src gnome org>]

commit 407cf455bf520105f2d110f594140a9ac0510a79
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Feb 16 17:59:29 2011 +0000

    keyboard: Use GSettings for those shortcuts

 panels/keyboard/00-multimedia.xml.in    |   32 ++++++++++--------------------
 panels/keyboard/01-launchers.xml.in     |   20 ++++++------------
 panels/keyboard/01-system.xml.in        |    8 ++----
 panels/keyboard/50-accessibility.xml.in |    2 +
 4 files changed, 23 insertions(+), 39 deletions(-)
---
diff --git a/panels/keyboard/00-multimedia.xml.in b/panels/keyboard/00-multimedia.xml.in
index 8d67e5c..7ad4488 100644
--- a/panels/keyboard/00-multimedia.xml.in
+++ b/panels/keyboard/00-multimedia.xml.in
@@ -1,35 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries group="system" _name="Sound and Media">
+<KeyListEntries group="system" schema="org.gnome.settings-daemon.plugins.media-keys" _name="Sound and Media">
 
-	<KeyListEntry
-	name="/apps/gnome_settings_daemon/keybindings/volume_mute" />
+	<KeyListEntry name="volume-mute" _description="Volume mute"/>
 
-	<KeyListEntry
-	name="/apps/gnome_settings_daemon/keybindings/volume_down" />
+	<KeyListEntry name="volume-down" _description="Volume down"/>
 
-	<KeyListEntry
-	name="/apps/gnome_settings_daemon/keybindings/volume_up" />
+	<KeyListEntry name="volume-up" _description="Volume up"/>
 
-	<KeyListEntry
-	name="/apps/gnome_settings_daemon/keybindings/media" />
+	<KeyListEntry name="media" _description="Launch media player"/>
 
-	<KeyListEntry
-	name="/apps/gnome_settings_daemon/keybindings/play" />
+	<KeyListEntry name="play" _description="Play (or play/pause)"/>
 
-	<KeyListEntry
-	name="/apps/gnome_settings_daemon/keybindings/pause" />
+	<KeyListEntry name="pause" _description="Pause playback"/>
 
-	<KeyListEntry
-	name="/apps/gnome_settings_daemon/keybindings/stop" />
+	<KeyListEntry name="stop" _description="Stop playback"/>
 
-	<KeyListEntry
-	name="/apps/gnome_settings_daemon/keybindings/previous" />
+	<KeyListEntry name="previous" _description="Previous track"/>
 
-	<KeyListEntry
-	name="/apps/gnome_settings_daemon/keybindings/next" />
+	<KeyListEntry name="next" _description="Next track"/>
 
-	<KeyListEntry
-	name="/apps/gnome_settings_daemon/keybindings/eject" />
+	<KeyListEntry name="eject" _description="Eject"/>
 
 </KeyListEntries>
 
diff --git a/panels/keyboard/01-launchers.xml.in b/panels/keyboard/01-launchers.xml.in
index 70797bb..45588d9 100644
--- a/panels/keyboard/01-launchers.xml.in
+++ b/panels/keyboard/01-launchers.xml.in
@@ -1,23 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries group="system" _name="Launchers">
+<KeyListEntries group="system" schema="org.gnome.settings-daemon.plugins.media-keys" _name="Launchers">
 
-	<KeyListEntry
-	name="/apps/gnome_settings_daemon/keybindings/help" />
+	<KeyListEntry name="help" _description="Launch help browser"/>
 
-	<KeyListEntry
-	name="/apps/gnome_settings_daemon/keybindings/calculator" />
+	<KeyListEntry name="calculator" _description="Launch calculator"/>
 
-	<KeyListEntry
-	name="/apps/gnome_settings_daemon/keybindings/email" />
+	<KeyListEntry name="email" _description="Launch email client"/>
 
-	<KeyListEntry
-	name="/apps/gnome_settings_daemon/keybindings/www" />
+	<KeyListEntry name="www" _description="Launch web browser"/>
 
-	<KeyListEntry
-	name="/apps/gnome_settings_daemon/keybindings/home" />
+	<KeyListEntry name="home" _description="Home folder"/>
 
-	<KeyListEntry
-	name="/apps/gnome_settings_daemon/keybindings/search" />
+	<KeyListEntry name="search" _description="Search"/>
 
 </KeyListEntries>
 
diff --git a/panels/keyboard/01-system.xml.in b/panels/keyboard/01-system.xml.in
index e82495b..0ce2afe 100644
--- a/panels/keyboard/01-system.xml.in
+++ b/panels/keyboard/01-system.xml.in
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries group="system" _name="System">
+<KeyListEntries group="system" schema="org.gnome.settings-daemon.plugins.media-keys" _name="System">
 
-	<KeyListEntry
-	name="/apps/gnome_settings_daemon/keybindings/power" />
+	<KeyListEntry name="logout" _description="Log out"/>
 
-	<KeyListEntry
-	name="/apps/gnome_settings_daemon/keybindings/screensaver" />
+	<KeyListEntry name="screensaver" _description="Lock screen"/>
 
 </KeyListEntries>
 
diff --git a/panels/keyboard/50-accessibility.xml.in b/panels/keyboard/50-accessibility.xml.in
index e59c225..17af97b 100644
--- a/panels/keyboard/50-accessibility.xml.in
+++ b/panels/keyboard/50-accessibility.xml.in
@@ -2,7 +2,9 @@
 <KeyListEntries group="system" _name="Universal Access" schema="org.gnome.settings-daemon.plugins.media-keys">
 
 	<KeyListEntry name="magnifier" _description="Toggle magnifier"/>
+
 	<KeyListEntry name="screenreader" _description="Toggle screen reader"/>
+
 	<KeyListEntry name="on-screen-keyboard" _description="Toggle on-screen keyboard"/>
 
 </KeyListEntries>