From 87a1e2b6bab78b817cb73b41e977cd786113509c Mon Sep 17 00:00:00 2001
From: Luca Ferretti <elle.uca@libero.it>
Date: Sat, 2 Feb 2008 13:39:19 +0000
Subject: [PATCH] reviewed by: Jens Granseuer <jensgr@gmx.net>

2008-02-02  Luca Ferretti  <elle.uca@libero.it>

	reviewed by: Jens Granseuer <jensgr@gmx.net>

	* 00-multimedia-key.xml.in:
	* 01-desktop-key.xml.in:
	Move Launch Calculator to Desktop group and sort
	all launch_app keybing together (Closes: #513867)


svn path=/trunk/; revision=8440
---
 capplets/keybindings/00-multimedia-key.xml.in |  3 ---
 capplets/keybindings/01-desktop-key.xml.in    | 15 +++++++++------
 capplets/keybindings/ChangeLog                |  9 +++++++++
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/capplets/keybindings/00-multimedia-key.xml.in b/capplets/keybindings/00-multimedia-key.xml.in
index 48033943f..b3d16819d 100644
--- a/capplets/keybindings/00-multimedia-key.xml.in
+++ b/capplets/keybindings/00-multimedia-key.xml.in
@@ -13,9 +13,6 @@
 	<KeyListEntry
 	name="/apps/gnome_settings_daemon/keybindings/media" />
 
-	<KeyListEntry	
-	name="/apps/gnome_settings_daemon/keybindings/calculator" />
-
 	<KeyListEntry
 	name="/apps/gnome_settings_daemon/keybindings/play" />
 
diff --git a/capplets/keybindings/01-desktop-key.xml.in b/capplets/keybindings/01-desktop-key.xml.in
index c703f0c5e..0f05f360d 100644
--- a/capplets/keybindings/01-desktop-key.xml.in
+++ b/capplets/keybindings/01-desktop-key.xml.in
@@ -4,6 +4,15 @@
 	<KeyListEntry
 	name="/apps/gnome_settings_daemon/keybindings/help" />
 
+	<KeyListEntry	
+	name="/apps/gnome_settings_daemon/keybindings/calculator" />
+
+	<KeyListEntry
+	name="/apps/gnome_settings_daemon/keybindings/email" />
+
+	<KeyListEntry
+	name="/apps/gnome_settings_daemon/keybindings/www" />
+
 	<KeyListEntry
 	name="/apps/gnome_settings_daemon/keybindings/power" />
 
@@ -18,12 +27,6 @@
 
 	<KeyListEntry
 	name="/apps/gnome_settings_daemon/keybindings/search" />
-	
-	<KeyListEntry
-	name="/apps/gnome_settings_daemon/keybindings/email" />
-
-	<KeyListEntry
-	name="/apps/gnome_settings_daemon/keybindings/www" />
 
 </KeyListEntries>
 
diff --git a/capplets/keybindings/ChangeLog b/capplets/keybindings/ChangeLog
index fad4756dd..da83bdf6c 100644
--- a/capplets/keybindings/ChangeLog
+++ b/capplets/keybindings/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-02  Luca Ferretti  <elle.uca@libero.it>
+
+	reviewed by: Jens Granseuer <jensgr@gmx.net>
+
+	* 00-multimedia-key.xml.in:
+	* 01-desktop-key.xml.in:
+	Move Launch Calculator to Desktop group and sort
+	all launch_app keybing together (Closes: #513867)
+
 2007-10-31  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* Makefile.am: Distcheck fixes.