[nautilus] convert exit with last window to gsettings

[Alexander Larsson <alexl src gnome org>]

commit a7163bb6c91c40a8dea2e3b6c34623a0449053a4
Author: Alexander Larsson <alexl redhat com>
Date:   Thu Jul 22 16:43:51 2010 +0200

    convert exit with last window to gsettings

 libnautilus-private/nautilus-global-preferences.c |    4 ----
 libnautilus-private/nautilus-global-preferences.h |    2 +-
 src/nautilus-main.c                               |    7 +++----
 3 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c
index 7f3a083..4d6744d 100644
--- a/libnautilus-private/nautilus-global-preferences.c
+++ b/libnautilus-private/nautilus-global-preferences.c
@@ -197,10 +197,6 @@ typedef struct
  * YOU SHOULD EDIT THE SCHEMAS FILE TO CHANGE DEFAULTS.
  */
 static const PreferenceDefault preference_defaults[] = {
-	{ NAUTILUS_PREFERENCES_EXIT_WITH_LAST_WINDOW,
-	  PREFERENCE_BOOLEAN,
-	  GINT_TO_POINTER (TRUE)
-	},
 	{ NAUTILUS_PREFERENCES_SHOW_TEXT_IN_ICONS,
 	  PREFERENCE_STRING,
 	  "local_only",
diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h
index 3f884df..5fb4c57 100644
--- a/libnautilus-private/nautilus-global-preferences.h
+++ b/libnautilus-private/nautilus-global-preferences.h
@@ -32,7 +32,7 @@
 G_BEGIN_DECLS
 
 /* Whether exit when last window destroyed */
-#define NAUTILUS_PREFERENCES_EXIT_WITH_LAST_WINDOW				"preferences/exit_with_last_window"
+#define NAUTILUS_PREFERENCES_EXIT_WITH_LAST_WINDOW		"exit-with-last-window"
 
 /* Desktop Background options */
 #define NAUTILUS_PREFERENCES_BACKGROUND_SET                     "background-set"
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index bae6267..3151653 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -467,15 +467,14 @@ main (int argc, char *argv[])
 	/* Initialize the services that we use. */
 	LIBXML_TEST_VERSION
 
-	/* Initialize preferences. This is needed so that proper 
-	 * defaults are available before any preference peeking 
-	 * happens.
+	/* Initialize preferences. This is needed to create the
+	 * global GSettings objects.
 	 */
 	nautilus_global_preferences_init ();
 
 	/* exit_with_last_window being FALSE, nautilus can run without window. */
 	exit_with_last_window =
-		eel_preferences_get_boolean (NAUTILUS_PREFERENCES_EXIT_WITH_LAST_WINDOW);
+		g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_EXIT_WITH_LAST_WINDOW);
 
 	application = NULL;