[gnome-settings-daemon] Move font-rendering to gsd namespace

[Bastien Nocera <hadess src gnome org>]

commit f14b00bf5506d210ed963e76f8073f123b159594
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Oct 11 14:16:17 2010 +0100

    Move font-rendering to gsd namespace
    
    From org.gnome.desktop to org.gnome.settings-daemon.plugins.xsettings

 configure.ac                                       |    2 +-
 data/Makefile.am                                   |    4 ++--
 data/gnome-settings-daemon.convert                 |    2 +-
 ...org.gnome.desktop.peripherals.gschema.xml.in.in |    4 ++--
 ...ngs-daemon.plugins.xsettings.gschema.xml.in.in} |    8 ++++----
 plugins/xsettings/gsd-xsettings-manager.c          |    2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2cb5189..bf5ad62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -462,7 +462,7 @@ data/Makefile
 data/gnome-settings-daemon.desktop.in
 data/gnome-settings-daemon.pc
 data/gnome-settings-daemon-uninstalled.pc
-data/org.gnome.desktop.font-rendering.gschema.xml.in
+data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in
 data/org.gnome.desktop.keybindings.gschema.xml.in
 data/org.gnome.desktop.peripherals.gschema.xml.in
 data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in
diff --git a/data/Makefile.am b/data/Makefile.am
index 4fc57be..5d66b10 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,13 +3,13 @@ NULL =
 apidir = $(includedir)/gnome-settings-daemon-$(GSD_API_VERSION)/gnome-settings-daemon
 api_DATA = gsd-enums.h
 
-gsettings_ENUM_NAMESPACE = org.gnome.desktop
+gsettings_ENUM_NAMESPACE = org.gnome.settings-daemon
 gsettings_ENUM_FILES = $(api_DATA)
 
 gsettings_SCHEMAS =							\
-	org.gnome.desktop.font-rendering.gschema.xml			\
 	org.gnome.desktop.keybindings.gschema.xml			\
 	org.gnome.desktop.peripherals.gschema.xml			\
+	org.gnome.settings-daemon.plugins.xsettings.gschema.xml		\
 	org.gnome.settings-daemon.plugins.housekeeping.gschema.xml	\
 	org.gnome.settings-daemon.plugins.xrandr.gschema.xml
 
diff --git a/data/gnome-settings-daemon.convert b/data/gnome-settings-daemon.convert
index e18a90e..29de1fa 100644
--- a/data/gnome-settings-daemon.convert
+++ b/data/gnome-settings-daemon.convert
@@ -1,4 +1,4 @@
-[org.gnome.desktop.font-rendering]
+[org.gnome.settings-daemon.plugins.xsettings]
 antialiasing = /desktop/gnome/font_rendering/antialiasing
 dpi = /desktop/gnome/font_rendering/dpi
 hinting = /desktop/gnome/font_rendering/hinting
diff --git a/data/org.gnome.desktop.peripherals.gschema.xml.in.in b/data/org.gnome.desktop.peripherals.gschema.xml.in.in
index 4cced99..d399908 100644
--- a/data/org.gnome.desktop.peripherals.gschema.xml.in.in
+++ b/data/org.gnome.desktop.peripherals.gschema.xml.in.in
@@ -4,7 +4,7 @@
     <child name="touchpad" schema="org.gnome.desktop.peripherals.touchpad"/>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.desktop.peripherals.smartcard" path="/desktop/gnome/peripherals/smartcard/">
-    <key name="removal-action" enum="org.gnome.desktop.GsdSmartcardRemovalAction">
+    <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>
@@ -21,7 +21,7 @@
       <_summary>Enable horizontal scrolling</_summary>
       <_description>Set this to TRUE to allow horizontal scrolling by the same method selected with the scroll_method key.</_description>
     </key>
-    <key name="scroll-method" enum="org.gnome.desktop.GsdTouchpadScrollMethod">
+    <key name="scroll-method" enum="org.gnome.settings-daemon.GsdTouchpadScrollMethod">
       <default>'edge-scrolling'</default>
       <_summary>Select the touchpad scroll method</_summary>
       <_description>Select the touchpad scroll method. Supported values are: "disabled", "edge-scrolling", "two-finger-scrolling".</_description>
diff --git a/data/org.gnome.desktop.font-rendering.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in.in
similarity index 77%
rename from data/org.gnome.desktop.font-rendering.gschema.xml.in.in
rename to data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in.in
index 7d0bc9a..4ee647f 100644
--- a/data/org.gnome.desktop.font-rendering.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in.in
@@ -1,6 +1,6 @@
 <schemalist>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.desktop.font-rendering" path="/desktop/gnome/font-rendering/">
-    <key name="antialiasing" enum="org.gnome.desktop.GsdFontAntialiasingMode">
+	<schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.xsettings" path="/apps/gnome-settings-daemon/plugins/xsettings/">
+    <key name="antialiasing" enum="org.gnome.settings-daemon.GsdFontAntialiasingMode">
       <default>'grayscale'</default>
       <_summary>Antialiasing</_summary>
       <_description>The type of antialiasing to use when rendering fonts. Possible values are: "none" for no antialiasing, "grayscale" for standard grayscale antialiasing, and "rgba" for subpixel antialiasing (LCD screens only).</_description>
@@ -10,12 +10,12 @@
       <_summary>DPI</_summary>
       <_description>The resolution used for converting font sizes to pixel sizes, in dots per inch. 0.0 DPI means that the X server's DPI will be used.</_description>
     </key>
-    <key name="hinting" enum="org.gnome.desktop.GsdFontHinting">
+    <key name="hinting" enum="org.gnome.settings-daemon.GsdFontHinting">
       <default>'medium'</default>
       <_summary>Hinting</_summary>
       <_description>The type of hinting to use when rendering fonts. Possible values are: "none" for no hinting, "slight" for basic, "medium" for moderate, and "full" for maximum hinting (may cause distortion of letter forms).</_description>
     </key>
-    <key name="rgba-order" enum="org.gnome.desktop.GsdFontRgbaOrder">
+    <key name="rgba-order" enum="org.gnome.settings-daemon.GsdFontRgbaOrder">
       <default>'rgb'</default>
       <_summary>RGBA order</_summary>
       <_description>The order of subpixel elements on an LCD screen; only used when antialiasing is set to "rgba". Possible values are: "rgb" for red on left (most common), "bgr" for blue on left, "vrgb" for red on top, "vbgr" for red on bottom.</_description>
diff --git a/plugins/xsettings/gsd-xsettings-manager.c b/plugins/xsettings/gsd-xsettings-manager.c
index 2ade03c..25e77c1 100644
--- a/plugins/xsettings/gsd-xsettings-manager.c
+++ b/plugins/xsettings/gsd-xsettings-manager.c
@@ -57,7 +57,7 @@
 #define GTK_MODULES_DIR        "/apps/gnome_settings_daemon/gtk-modules"
 
 #ifdef HAVE_FONTCONFIG
-#define FONT_RENDER_DIR "org.gnome.desktop.font-rendering"
+#define FONT_RENDER_DIR "org.gnome.settings-daemon.plugins.xsettings"
 #define FONT_ANTIALIASING_KEY "antialiasing"
 #define FONT_HINTING_KEY      "hinting"
 #define FONT_RGBA_ORDER_KEY   "rgba_order"