[gnome-settings-daemon] Change GSettings namespace for peripherals

[Bastien Nocera <hadess src gnome org>]

commit fb9bffaaa20aad2d4b59b831022ab587af0d0d26
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Oct 11 14:56:38 2010 +0100

    Change GSettings namespace for peripherals

 configure.ac                                       |    2 +-
 data/Makefile.am                                   |    2 +-
 data/gnome-settings-daemon.convert                 |    4 ++--
 ....settings-daemon.peripherals.gschema.xml.in.in} |   10 +++++-----
 plugins/media-keys/gsd-media-keys-manager.c        |    2 +-
 plugins/mouse/gsd-mouse-manager.c                  |    2 +-
 plugins/smartcard/gsd-smartcard-plugin.c           |    2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3a97c29..7362025 100644
--- a/configure.ac
+++ b/configure.ac
@@ -463,7 +463,7 @@ data/gnome-settings-daemon.pc
 data/gnome-settings-daemon-uninstalled.pc
 data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in
 data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in
-data/org.gnome.desktop.peripherals.gschema.xml.in
+data/org.gnome.settings-daemon.peripherals.gschema.xml.in
 data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in
 data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in
 po/Makefile.in
diff --git a/data/Makefile.am b/data/Makefile.am
index da5be20..47124b9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -7,7 +7,7 @@ gsettings_ENUM_NAMESPACE = org.gnome.settings-daemon
 gsettings_ENUM_FILES = $(api_DATA)
 
 gsettings_SCHEMAS =							\
-	org.gnome.desktop.peripherals.gschema.xml			\
+	org.gnome.settings-daemon.peripherals.gschema.xml		\
 	org.gnome.settings-daemon.plugins.media-keys.gschema.xml	\
 	org.gnome.settings-daemon.plugins.xsettings.gschema.xml		\
 	org.gnome.settings-daemon.plugins.housekeeping.gschema.xml	\
diff --git a/data/gnome-settings-daemon.convert b/data/gnome-settings-daemon.convert
index 04f37ae..e7dca04 100644
--- a/data/gnome-settings-daemon.convert
+++ b/data/gnome-settings-daemon.convert
@@ -26,10 +26,10 @@ volume-mute = /apps/gnome_settings_daemon/keybindings/volume_mute
 volume-up = /apps/gnome_settings_daemon/keybindings/volume_up
 www = /apps/gnome_settings_daemon/keybindings/www
 
-[org.gnome.desktop.peripherals.smartcard]
+[org.gnome.settings-daemon.peripherals.smartcard]
 removal-action = /desktop/gnome/peripherals/smartcard/removal_action
 
-[org.gnome.desktop.peripherals.touchpad]
+[org.gnome.settings-daemon.peripherals.touchpad]
 disable-while-typing = /desktop/gnome/peripherals/touchpad/disable_while_typing
 horiz-scroll-enabled = /desktop/gnome/peripherals/touchpad/horiz_scroll_enabled
 scroll-method = /desktop/gnome/peripherals/touchpad/scroll_method
diff --git a/data/org.gnome.desktop.peripherals.gschema.xml.in.in b/data/org.gnome.settings-daemon.peripherals.gschema.xml.in.in
similarity index 75%
rename from data/org.gnome.desktop.peripherals.gschema.xml.in.in
rename to data/org.gnome.settings-daemon.peripherals.gschema.xml.in.in
index d399908..a945d04 100644
--- a/data/org.gnome.desktop.peripherals.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.peripherals.gschema.xml.in.in
@@ -1,16 +1,16 @@
 <schemalist>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.desktop.peripherals" path="/desktop/gnome/peripherals/">
-    <child name="smartcard" schema="org.gnome.desktop.peripherals.smartcard"/>
-    <child name="touchpad" schema="org.gnome.desktop.peripherals.touchpad"/>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.peripherals" path="/desktop/gnome/peripherals/">
+    <child name="smartcard" schema="org.gnome.settings-daemon.peripherals.smartcard"/>
+    <child name="touchpad" schema="org.gnome.settings-daemon.peripherals.touchpad"/>
   </schema>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.desktop.peripherals.smartcard" path="/desktop/gnome/peripherals/smartcard/">
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.peripherals.smartcard" path="/desktop/gnome/peripherals/smartcard/">
     <key name="removal-action" enum="org.gnome.settings-daemon.GsdSmartcardRemovalAction">
       <default>'none'</default>
       <_summary>Smartcard removal action</_summary>
       <_description>Set this to one of "none", "lock-screen", or "force-logout". The action will get performed when the smartcard used for log in is removed.</_description>
     </key>
   </schema>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.desktop.peripherals.touchpad" path="/desktop/gnome/peripherals/touchpad/">
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.peripherals.touchpad" path="/desktop/gnome/peripherals/touchpad/">
     <key name="disable-while-typing" type="b">
       <default>false</default>
       <_summary>Disable touchpad while typing</_summary>
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index b6e0edf..0def163 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -554,7 +554,7 @@ do_touchpad_action (GsdMediaKeysManager *manager)
         GSettings *settings;
         gboolean state;
 
-        settings = g_settings_new ("org.gnome.desktop.peripherals.touchpad");
+        settings = g_settings_new ("org.gnome.settings-daemon.peripherals.touchpad");
         state = g_settings_get_boolean (settings, TOUCHPAD_ENABLED_KEY);
 
         dialog_init (manager);
diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
index e2a4de6..bade34e 100644
--- a/plugins/mouse/gsd-mouse-manager.c
+++ b/plugins/mouse/gsd-mouse-manager.c
@@ -56,7 +56,7 @@
 
 #define GCONF_MOUSE_DIR         "/desktop/gnome/peripherals/mouse"
 #define GCONF_MOUSE_A11Y_DIR    "/desktop/gnome/accessibility/mouse"
-#define SETTINGS_TOUCHPAD_DIR      "org.gnome.desktop.peripherals.touchpad"
+#define SETTINGS_TOUCHPAD_DIR      "org.gnome.settings-daemon.peripherals.touchpad"
 
 #define KEY_LEFT_HANDED         GCONF_MOUSE_DIR "/left_handed"
 #define KEY_MOTION_ACCELERATION GCONF_MOUSE_DIR "/motion_acceleration"
diff --git a/plugins/smartcard/gsd-smartcard-plugin.c b/plugins/smartcard/gsd-smartcard-plugin.c
index 4ac3d51..3d1dcd4 100644
--- a/plugins/smartcard/gsd-smartcard-plugin.c
+++ b/plugins/smartcard/gsd-smartcard-plugin.c
@@ -184,7 +184,7 @@ get_configured_remove_action (GsdSmartcardPlugin *plugin)
         char *remove_action_string;
         GsdSmartcardRemoveAction remove_action;
 
-        settings = g_settings_new ("org.gnome.desktop.peripherals.smartcard");
+        settings = g_settings_new ("org.gnome.settings-daemon.peripherals.smartcard");
         remove_action_string = g_settings_get_string (settings, KEY_REMOVE_ACTION);
 
         if (remove_action_string == NULL) {