[nautilus] Convert default-folder-view to gsettings

[Alexander Larsson <alexl src gnome org>]

commit 3f87495987c2db24002e48da344e96243a5c70e2
Author: Alexander Larsson <alexl redhat com>
Date:   Thu Jul 22 17:42:39 2010 +0200

    Convert default-folder-view to gsettings

 libnautilus-private/nautilus-global-preferences.c |   19 ++-----------------
 libnautilus-private/nautilus-global-preferences.h |    2 +-
 src/nautilus-file-management-properties.c         |   16 ++++++++--------
 3 files changed, 11 insertions(+), 26 deletions(-)
---
diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c
index f14dc40..23303eb 100644
--- a/libnautilus-private/nautilus-global-preferences.c
+++ b/libnautilus-private/nautilus-global-preferences.c
@@ -111,12 +111,6 @@ static EelEnumerationEntry search_bar_type_enum_entries[] = {
 	}
 };
 
-static EelEnumerationEntry default_folder_viewer_enum_entries[] = {
-	{ "icon_view",	    N_("Icon View"),	NAUTILUS_DEFAULT_FOLDER_VIEWER_ICON_VIEW },
-	{ "compact_view",   N_("Compact View"),	NAUTILUS_DEFAULT_FOLDER_VIEWER_COMPACT_VIEW },
-	{ "list_view",	    N_("List View"),	NAUTILUS_DEFAULT_FOLDER_VIEWER_LIST_VIEW }
-};
-
 static EelEnumerationEntry default_icon_view_sort_order_enum_entries[] = {
 	{ "manually",	       N_("Manually"),		    PREFERENCES_SORT_ORDER_MANUALLY },
 	{ "--------",             "--------" },
@@ -248,12 +242,6 @@ static const PreferenceDefault preference_defaults[] = {
 	  PREFERENCE_BOOLEAN,
 	  GINT_TO_POINTER (TRUE)
 	},
-	{ NAUTILUS_PREFERENCES_DEFAULT_FOLDER_VIEWER,
-	  PREFERENCE_INTEGER,
-	  GINT_TO_POINTER (NAUTILUS_DEFAULT_FOLDER_VIEWER_ICON_VIEW),
-	  NULL, NULL,
-	  "default_folder_viewer"
-	},
 
 	/* Icon View Default Preferences */
 	{ NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_ORDER,
@@ -436,9 +424,6 @@ global_preferences_register_enumerations (void)
 	 * populate widgets and route preferences changes between the
 	 * storage (GConf) and the displayed values.
 	 */
-	eel_enumeration_register ("default_folder_viewer",
-				  default_folder_viewer_enum_entries,
-				  G_N_ELEMENTS (default_folder_viewer_enum_entries));
 	eel_enumeration_register ("default_icon_view_sort_order",
 				  default_icon_view_sort_order_enum_entries,
 				  G_N_ELEMENTS (default_icon_view_sort_order_enum_entries));
@@ -558,8 +543,8 @@ nautilus_global_preferences_get_default_folder_viewer_preference_as_iid (void)
 	int preference_value;
 	const char *viewer_iid;
 
-	preference_value = 
-		eel_preferences_get_enum (NAUTILUS_PREFERENCES_DEFAULT_FOLDER_VIEWER);
+	preference_value =
+		g_settings_get_enum (nautilus_preferences, NAUTILUS_PREFERENCES_DEFAULT_FOLDER_VIEWER);
 
 	if (preference_value == NAUTILUS_DEFAULT_FOLDER_VIEWER_LIST_VIEW) {
 		viewer_iid = NAUTILUS_LIST_VIEW_IID;
diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h
index eba12b4..3151cec 100644
--- a/libnautilus-private/nautilus-global-preferences.h
+++ b/libnautilus-private/nautilus-global-preferences.h
@@ -118,7 +118,7 @@ typedef enum
 #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"
+#define NAUTILUS_PREFERENCES_DEFAULT_FOLDER_VIEWER		"default-folder-viewer"
 
 enum
 {
diff --git a/src/nautilus-file-management-properties.c b/src/nautilus-file-management-properties.c
index 753222f..c19c229 100644
--- a/src/nautilus-file-management-properties.c
+++ b/src/nautilus-file-management-properties.c
@@ -75,9 +75,9 @@
 #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_THUMBNAIL_LIMIT_WIDGET "preview_image_size_combobox"
 
 static const char * const default_view_values[] = {
-	"icon_view",
-	"list_view",
-	"compact_view",
+	"icon-view",
+	"list-view",
+	"compact-view",
 	NULL
 };
 
@@ -898,12 +898,12 @@ nautilus_file_management_properties_dialog_setup (GtkBuilder *builder, GtkWindow
 					      NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TREE_VIEW_FOLDERS_WIDGET,
 					      NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES);
 
+	bind_builder_enum (builder, nautilus_preferences,
+			   NAUTILUS_FILE_MANAGEMENT_PROPERTIES_DEFAULT_VIEW_WIDGET,
+			   NAUTILUS_PREFERENCES_DEFAULT_FOLDER_VIEWER,
+			   (const char **) default_view_values);
 	eel_preferences_builder_connect_string_enum_combo_box (builder,
-							       NAUTILUS_FILE_MANAGEMENT_PROPERTIES_DEFAULT_VIEW_WIDGET,
-							       NAUTILUS_PREFERENCES_DEFAULT_FOLDER_VIEWER,
-							       (const char **) default_view_values);
-	eel_preferences_builder_connect_string_enum_combo_box (builder,
-							       NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ICON_VIEW_ZOOM_WIDGET,						     
+							       NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ICON_VIEW_ZOOM_WIDGET,
 							       NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL,
 							       (const char **) zoom_values);
 	eel_preferences_builder_connect_string_enum_combo_box (builder,