[nautilus] Convert sort-directories-first to gsettings

[Alexander Larsson <alexl src gnome org>]

commit 87aa83c53183b02ca78fedf3c39b4ff15ad09e11
Author: Alexander Larsson <alexl redhat com>
Date:   Thu Jul 22 17:36:26 2010 +0200

    Convert sort-directories-first to gsettings

 libnautilus-private/nautilus-global-preferences.c |    4 ----
 libnautilus-private/nautilus-global-preferences.h |    2 +-
 src/file-manager/fm-directory-view.c              |   17 +++++++++--------
 src/nautilus-file-management-properties.c         |    6 +++---
 4 files changed, 13 insertions(+), 16 deletions(-)
---
diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c
index f408f9a..f14dc40 100644
--- a/libnautilus-private/nautilus-global-preferences.c
+++ b/libnautilus-private/nautilus-global-preferences.c
@@ -232,10 +232,6 @@ static const PreferenceDefault preference_defaults[] = {
 	  NULL, NULL,
 	  "speed_tradeoff"
 	},
-	{ NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST,
-	  PREFERENCE_BOOLEAN,
-	  GINT_TO_POINTER (FALSE)
-	},
 	{ NAUTILUS_PREFERENCES_SEARCH_BAR_TYPE,
 	  PREFERENCE_STRING,
 	  "search_by_text",
diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h
index 8e25b4e..eba12b4 100644
--- a/libnautilus-private/nautilus-global-preferences.h
+++ b/libnautilus-private/nautilus-global-preferences.h
@@ -115,7 +115,7 @@ typedef enum
 #define NAUTILUS_WINDOW_STATE_SIDEBAR_WIDTH			"sidebar-width"
 
 /* Sorting order */
-#define NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST		"preferences/sort_directories_first"
+#define NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST		"sort-directories-first"
 
 /* The default folder viewer - one of the two enums below */
 #define NAUTILUS_PREFERENCES_DEFAULT_FOLDER_VIEWER		"preferences/default_folder_viewer"
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 1fb13de..633d346 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -1611,8 +1611,8 @@ sort_directories_first_changed_callback (gpointer callback_data)
 
 	view = FM_DIRECTORY_VIEW (callback_data);
 
-	preference_value = 
-		eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST);
+	preference_value =
+		g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST);
 
 	if (preference_value != view->details->sort_directories_first) {
 		view->details->sort_directories_first = preference_value;
@@ -1969,8 +1969,8 @@ fm_directory_view_init (FMDirectoryView *view)
 				 G_CALLBACK (user_dirs_changed),
 				 view, G_CONNECT_SWAPPED);
 
-	view->details->sort_directories_first = 
-		eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST);
+	view->details->sort_directories_first =
+		g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST);
 
 	g_signal_connect_object (nautilus_trash_monitor_get (), "trash_state_changed",
 				 G_CALLBACK (fm_directory_view_trash_state_changed_callback), view, 0);
@@ -1997,8 +1997,9 @@ fm_directory_view_init (FMDirectoryView *view)
 				  view);
 	eel_preferences_add_callback (NAUTILUS_PREFERENCES_CLICK_POLICY,
 				      click_policy_changed_callback, view);
-	eel_preferences_add_callback (NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST, 
-				      sort_directories_first_changed_callback, view);
+	g_signal_connect_swapped (nautilus_preferences,
+				  "changed::" NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST, 
+				  G_CALLBACK(sort_directories_first_changed_callback), view);
 	eel_preferences_add_callback (NAUTILUS_PREFERENCES_LOCKDOWN_COMMAND_LINE,
 				      lockdown_disable_command_line_changed_callback, view);
 }
@@ -2011,7 +2012,7 @@ real_unmerge_menus (FMDirectoryView *view)
 	if (view->details->window == NULL) {
 		return;
 	}
-	
+
 	ui_manager = nautilus_window_info_get_ui_manager (view->details->window);
 
 	nautilus_ui_unmerge_ui (ui_manager,
@@ -2111,7 +2112,7 @@ fm_directory_view_finalize (GObject *object)
 					 image_display_policy_changed_callback, view);
 	g_signal_handlers_disconnect_by_func (nautilus_preferences,
 					      click_policy_changed_callback, view);
-	eel_preferences_remove_callback (NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST,
+	g_signal_handlers_disconnect_by_func (nautilus_preferences,
 					 sort_directories_first_changed_callback, view);
 	eel_preferences_remove_callback (NAUTILUS_PREFERENCES_LOCKDOWN_COMMAND_LINE,
 					 lockdown_disable_command_line_changed_callback, view);
diff --git a/src/nautilus-file-management-properties.c b/src/nautilus-file-management-properties.c
index bc235a9..753222f 100644
--- a/src/nautilus-file-management-properties.c
+++ b/src/nautilus-file-management-properties.c
@@ -871,9 +871,9 @@ nautilus_file_management_properties_dialog_setup (GtkBuilder *builder, GtkWindow
 	eel_preferences_builder_connect_bool (builder,
 					      NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ALL_COLUMNS_SAME_WIDTH,
 					      NAUTILUS_PREFERENCES_COMPACT_VIEW_ALL_COLUMNS_SAME_WIDTH);
-	eel_preferences_builder_connect_bool (builder,
-					      NAUTILUS_FILE_MANAGEMENT_PROPERTIES_FOLDERS_FIRST_WIDGET,
-					      NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST); 
+	bind_builder_bool (builder, nautilus_preferences,
+			   NAUTILUS_FILE_MANAGEMENT_PROPERTIES_FOLDERS_FIRST_WIDGET,
+			   NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST);
 	bind_builder_bool_inverted (builder, nautilus_preferences,
 				    NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ALWAYS_USE_BROWSER_WIDGET,
 				    NAUTILUS_PREFERENCES_ALWAYS_USE_BROWSER);