[nautilus] Use gnome global 'show-desktop-icons' settings

[Tomas Bzatek <tbzatek src gnome org>]

commit 1f135b5da410b7a0052d22322d740037036b39b0
Author: Tomas Bzatek <tbzatek redhat com>
Date:   Tue Oct 19 15:47:50 2010 +0200

    Use gnome global 'show-desktop-icons' settings
    
    See bug 632225 for details.

 libnautilus-private/nautilus-global-preferences.c  |    1 +
 libnautilus-private/nautilus-global-preferences.h  |    6 +++++-
 libnautilus-private/nautilus.convert               |    1 -
 .../org.gnome.nautilus.gschema.xml.in              |    5 -----
 src/nautilus-application.c                         |    6 +++---
 5 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c
index 720198f..718b763 100644
--- a/libnautilus-private/nautilus-global-preferences.c
+++ b/libnautilus-private/nautilus-global-preferences.c
@@ -81,6 +81,7 @@ nautilus_global_preferences_init (void)
 	nautilus_desktop_preferences = g_settings_new("org.gnome.nautilus.desktop");
 	nautilus_tree_sidebar_preferences = g_settings_new("org.gnome.nautilus.sidebar-panels.tree");
 	gnome_lockdown_preferences = g_settings_new("org.gnome.desktop.lockdown");
+	gnome_background_preferences = g_settings_new("org.gnome.desktop.background");
 
 	nautilus_gconf_client = gconf_client_get_default ();
 
diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h
index 2847be1..acdbb71 100644
--- a/libnautilus-private/nautilus-global-preferences.h
+++ b/libnautilus-private/nautilus-global-preferences.h
@@ -50,7 +50,6 @@ G_BEGIN_DECLS
 #define NAUTILUS_PREFERENCES_ENABLE_DELETE			"enable-delete"
 
 /* Desktop options */
-#define NAUTILUS_PREFERENCES_SHOW_DESKTOP			"show-desktop"
 #define NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR                "desktop-is-home-dir"
 
 /* Display  */
@@ -198,6 +197,10 @@ typedef enum
 /* Lockdown */
 #define NAUTILUS_PREFERENCES_LOCKDOWN_COMMAND_LINE         "disable-command-line"
 
+/* Desktop background */
+#define NAUTILUS_PREFERENCES_SHOW_DESKTOP		   "show-desktop-icons"
+
+
 void nautilus_global_preferences_init                      (void);
 char *nautilus_global_preferences_get_default_folder_viewer_preference_as_iid (void);
 
@@ -210,6 +213,7 @@ GSettings *nautilus_tree_sidebar_preferences;
 GSettings *nautilus_media_preferences;
 GSettings *nautilus_window_state;
 GSettings *gnome_lockdown_preferences;
+GSettings *gnome_background_preferences;
 
 GConfClient *nautilus_gconf_client;
 
diff --git a/libnautilus-private/nautilus.convert b/libnautilus-private/nautilus.convert
index 5eca16f..c6955cf 100644
--- a/libnautilus-private/nautilus.convert
+++ b/libnautilus-private/nautilus.convert
@@ -20,7 +20,6 @@ show-advanced-permissions = /apps/nautilus/preferences/show_advanced_permissions
 sort-directories-first = /apps/nautilus/preferences/sort_directories_first
 default-sort-order = /apps/nautilus/icon_view/default_sort_order
 default-sort-in-reverse-order = /apps/nautilus/icon_view/default_sort_in_reverse_order
-show-desktop = /apps/nautilus/preferences/show_desktop
 desktop-is-home-dir = /apps/nautilus/preferences/desktop_is_home_dir
 default-folder-viewer = /apps/nautilus/preferences/default_folder_viewer
 date-format = /apps/nautilus/preferences/date_format
diff --git a/libnautilus-private/org.gnome.nautilus.gschema.xml.in b/libnautilus-private/org.gnome.nautilus.gschema.xml.in
index 0e5352f..07282ec 100644
--- a/libnautilus-private/org.gnome.nautilus.gschema.xml.in
+++ b/libnautilus-private/org.gnome.nautilus.gschema.xml.in
@@ -180,11 +180,6 @@
       <_summary>Reverse sort order in new windows</_summary>
       <_description>If true, files in new windows will be sorted in reverse order. ie, if sorted by name, then instead of sorting the files from "a" to "z", they will be sorted from "z" to "a"; if sorted by size, instead of being incrementally they will be sorted decrementally.</_description>
     </key>
-    <key name="show-desktop" type="b">
-      <default>true</default>
-      <_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-is-home-dir" type="b">
       <default>false</default>
       <_summary>Nautilus uses the users home folder as the desktop</_summary>
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index a3ae812..2d5f476 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -926,7 +926,7 @@ nautilus_application_startup (NautilusApplication *application,
 		char *accel_map_filename;
 
 		if (!no_desktop &&
-		    !g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_SHOW_DESKTOP)) {
+		    !g_settings_get_boolean (gnome_background_preferences, NAUTILUS_PREFERENCES_SHOW_DESKTOP)) {
 			no_desktop = TRUE;
 		}
 
@@ -947,7 +947,7 @@ nautilus_application_startup (NautilusApplication *application,
 		}
 
 		/* Monitor the preference to show or hide the desktop */
-		g_signal_connect_swapped (nautilus_preferences, "changed::" NAUTILUS_PREFERENCES_SHOW_DESKTOP,
+		g_signal_connect_swapped (gnome_background_preferences, "changed::" NAUTILUS_PREFERENCES_SHOW_DESKTOP,
 					  G_CALLBACK(desktop_changed_callback),
 					  G_OBJECT (application));
 
@@ -1500,7 +1500,7 @@ desktop_changed_callback (gpointer user_data)
 	NautilusApplication *application;
 
 	application = NAUTILUS_APPLICATION (user_data);
-	if (g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_SHOW_DESKTOP)) {
+	if (g_settings_get_boolean (gnome_background_preferences, NAUTILUS_PREFERENCES_SHOW_DESKTOP)) {
 		nautilus_application_open_desktop (application);
 	} else {
 		nautilus_application_close_desktop ();