[nautilus] Convert side pane width to gsettings

[Alexander Larsson <alexl src gnome org>]

commit d6ab21e01e525f7c18b6c592802cc4f3b8764665
Author: Alexander Larsson <alexl redhat com>
Date:   Wed Jul 21 15:37:39 2010 +0200

    Convert side pane width to gsettings

 libnautilus-private/nautilus-global-preferences.c |    4 --
 libnautilus-private/nautilus-global-preferences.h |    2 +-
 src/nautilus-navigation-window.c                  |   32 +++++++-------------
 3 files changed, 12 insertions(+), 26 deletions(-)
---
diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c
index cf64609..1b922de 100644
--- a/libnautilus-private/nautilus-global-preferences.c
+++ b/libnautilus-private/nautilus-global-preferences.c
@@ -335,10 +335,6 @@ static const PreferenceDefault preference_defaults[] = {
 	  NULL, NULL,
 	  NULL
 	},
-	{ NAUTILUS_PREFERENCES_SIDEBAR_WIDTH,
-	  PREFERENCE_INTEGER,
-	  GINT_TO_POINTER (148)
-	},
 	{ NAUTILUS_PREFERENCES_ALWAYS_USE_BROWSER,
 	  PREFERENCE_BOOLEAN,
 	  GINT_TO_POINTER (TRUE)
diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h
index d319601..486195a 100644
--- a/libnautilus-private/nautilus-global-preferences.h
+++ b/libnautilus-private/nautilus-global-preferences.h
@@ -45,7 +45,7 @@ G_BEGIN_DECLS
 #define NAUTILUS_PREFERENCES_SIDE_PANE_BACKGROUND_URI           "side-pane-background-uri"
 
 /* How wide the sidebar is (or how wide it will be when expanded) */
-#define NAUTILUS_PREFERENCES_SIDEBAR_WIDTH  			"preferences/sidebar_width"
+#define NAUTILUS_PREFERENCES_SIDEBAR_WIDTH			"sidebar-width"
 
 /* Automount options */
 #define NAUTILUS_PREFERENCES_MEDIA_AUTOMOUNT	                "preferences/media_automount"
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 59d0e9e..c7c4a4c 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -88,9 +88,6 @@ enum {
 	ARG_APP
 };
 
-static int side_pane_width_auto_value = 0;
-
-
 /* Forward and back buttons on the mouse */
 static gboolean mouse_extra_buttons = TRUE;
 static int mouse_forward_button = 9;
@@ -364,15 +361,15 @@ side_pane_size_allocate_callback (GtkWidget *widget,
 				  gpointer user_data)
 {
 	NautilusNavigationWindow *window;
-	
+
 	window = NAUTILUS_NAVIGATION_WINDOW (user_data);
-	
+
 	if (allocation->width != window->details->side_pane_width) {
 		window->details->side_pane_width = allocation->width;
-		if (eel_preferences_key_is_writable (NAUTILUS_PREFERENCES_SIDEBAR_WIDTH)) {
-			eel_preferences_set_integer
-				(NAUTILUS_PREFERENCES_SIDEBAR_WIDTH, 
-				 allocation->width <= 1 ? 0 : allocation->width);
+		if (g_settings_is_writable (nautilus_preferences, NAUTILUS_PREFERENCES_SIDEBAR_WIDTH)) {
+			g_settings_set_int (nautilus_preferences,
+					    NAUTILUS_PREFERENCES_SIDEBAR_WIDTH,
+					    allocation->width <= 1 ? 0 : allocation->width);
 		}
 	}
 }
@@ -380,21 +377,14 @@ side_pane_size_allocate_callback (GtkWidget *widget,
 static void
 setup_side_pane_width (NautilusNavigationWindow *window)
 {
-	static gboolean setup_auto_value= TRUE;
-
 	g_return_if_fail (window->sidebar != NULL);
-	
-	if (setup_auto_value) {
-		setup_auto_value = FALSE;
-		eel_preferences_add_auto_integer 
-			(NAUTILUS_PREFERENCES_SIDEBAR_WIDTH,
-			 &side_pane_width_auto_value);
-	}
 
-	window->details->side_pane_width = side_pane_width_auto_value;
+	window->details->side_pane_width =
+		g_settings_get_int (nautilus_preferences,
+				    NAUTILUS_PREFERENCES_SIDEBAR_WIDTH);
 
-	gtk_paned_set_position (GTK_PANED (window->details->content_paned), 
-				side_pane_width_auto_value);
+	gtk_paned_set_position (GTK_PANED (window->details->content_paned),
+				window->details->side_pane_width);
 }
 
 static void