[nautilus] Move desktop-font preference to desktop settings

[Alexander Larsson <alexl src gnome org>]

commit f495063f73e4949959678280186f99bb801f804b
Author: Alexander Larsson <alexl redhat com>
Date:   Fri Jul 23 11:05:40 2010 +0200

    Move desktop-font preference to desktop settings

 libnautilus-private/nautilus-global-preferences.h  |    2 +-
 .../org.gnome.nautilus.gschema.xml.in              |   10 +++++-----
 src/file-manager/fm-desktop-icon-view.c            |    5 +++--
 3 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h
index 4968857..bccb59a 100644
--- a/libnautilus-private/nautilus-global-preferences.h
+++ b/libnautilus-private/nautilus-global-preferences.h
@@ -61,7 +61,6 @@ G_BEGIN_DECLS
 /* Desktop options */
 #define NAUTILUS_PREFERENCES_SHOW_DESKTOP			"show-desktop"
 #define NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR                "desktop-is-home-dir"
-#define NAUTILUS_PREFERENCES_DESKTOP_FONT			"desktop-font"
 
 /* Display  */
 #define NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES			"show-hidden-files"
@@ -193,6 +192,7 @@ typedef enum
 	NAUTILUS_SIMPLE_SEARCH_BAR
 } NautilusSearchBarMode;
 
+#define NAUTILUS_PREFERENCES_DESKTOP_FONT		   "font"
 #define NAUTILUS_PREFERENCES_DESKTOP_HOME_VISIBLE          "home-icon-visible"
 #define NAUTILUS_PREFERENCES_DESKTOP_HOME_NAME             "home-icon-name"
 #define NAUTILUS_PREFERENCES_DESKTOP_COMPUTER_VISIBLE      "computer-icon-visible"
diff --git a/libnautilus-private/org.gnome.nautilus.gschema.xml.in b/libnautilus-private/org.gnome.nautilus.gschema.xml.in
index 93d1c21..4991f2f 100644
--- a/libnautilus-private/org.gnome.nautilus.gschema.xml.in
+++ b/libnautilus-private/org.gnome.nautilus.gschema.xml.in
@@ -186,11 +186,6 @@
       <_summary>Nautilus handles drawing the desktop</_summary>
       <_description>If set to true, then Nautilus will draw the icons on the desktop.</_description>
     </key>
-    <key name="desktop-font" type="s">
-      <default l10n="messages" context="desktop-font">''</default>
-      <_summary>Desktop font</_summary>
-      <_description>The font _description used for the icons on the desktop.</_description>
-    </key>
     <key name="desktop-is-home-dir" type="b">
       <default>false</default>
       <_summary>Nautilus uses the users home folder as the desktop</_summary>
@@ -347,6 +342,11 @@
   </schema>
 
   <schema id="org.gnome.nautilus.desktop" path="/apps/nautilus/desktop/" gettext-domain="nautilus">
+    <key name="font" type="s">
+      <default l10n="messages" context="desktop-font">''</default>
+      <_summary>Desktop font</_summary>
+      <_description>The font _description used for the icons on the desktop.</_description>
+    </key>
     <key name="home-icon-visible" type="b">
       <default>true</default>
       <_summary>Home icon visible on desktop</_summary>
diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c
index d1ce8dd..5dde0d9 100644
--- a/src/file-manager/fm-desktop-icon-view.c
+++ b/src/file-manager/fm-desktop-icon-view.c
@@ -524,7 +524,8 @@ fm_desktop_icon_view_update_icon_container_fonts (FMDesktopIconView *icon_view)
 	icon_container = get_icon_container (icon_view);
 	g_assert (icon_container != NULL);
 
-	font = g_settings_get_string (nautilus_preferences, NAUTILUS_PREFERENCES_DESKTOP_FONT);
+	font = g_settings_get_string (nautilus_desktop_preferences,
+				      NAUTILUS_PREFERENCES_DESKTOP_FONT);
 
 	nautilus_icon_container_set_font (icon_container, font);
 
@@ -606,7 +607,7 @@ fm_desktop_icon_view_init (FMDesktopIconView *desktop_icon_view)
 				  G_CALLBACK (default_zoom_level_changed),
 				  desktop_icon_view);
 
-	g_signal_connect_swapped (nautilus_preferences,
+	g_signal_connect_swapped (nautilus_desktop_preferences,
 				  "changed::" NAUTILUS_PREFERENCES_DESKTOP_FONT,
 				  G_CALLBACK (font_changed_callback),
 				  desktop_icon_view);