diff options
| -rw-r--r-- | libcaja-private/caja-global-preferences.c | 19 | ||||
| -rw-r--r-- | libcaja-private/caja-global-preferences.h | 2 | ||||
| -rw-r--r-- | src/caja-file-management-properties.c | 14 |
3 files changed, 9 insertions, 26 deletions
diff --git a/libcaja-private/caja-global-preferences.c b/libcaja-private/caja-global-preferences.c index 5df398bc..60be7dda 100644 --- a/libcaja-private/caja-global-preferences.c +++ b/libcaja-private/caja-global-preferences.c @@ -118,13 +118,6 @@ static EelEnumerationEntry search_bar_type_enum_entries[] = } }; -static EelEnumerationEntry default_folder_viewer_enum_entries[] = -{ - { "icon_view", N_("Icon View"), CAJA_DEFAULT_FOLDER_VIEWER_ICON_VIEW }, - { "compact_view", N_("Compact View"), CAJA_DEFAULT_FOLDER_VIEWER_COMPACT_VIEW }, - { "list_view", N_("List View"), CAJA_DEFAULT_FOLDER_VIEWER_LIST_VIEW } -}; - static EelEnumerationEntry default_icon_view_sort_order_enum_entries[] = { { "manually", N_("Manually"), PREFERENCES_SORT_ORDER_MANUALLY }, @@ -267,13 +260,6 @@ static const PreferenceDefault preference_defaults[] = PREFERENCE_BOOLEAN, GINT_TO_POINTER (TRUE) }, - { - CAJA_PREFERENCES_DEFAULT_FOLDER_VIEWER, - PREFERENCE_INTEGER, - GINT_TO_POINTER (CAJA_DEFAULT_FOLDER_VIEWER_ICON_VIEW), - NULL, NULL, - "default_folder_viewer" - }, /* Icon View Default Preferences */ { @@ -479,9 +465,6 @@ global_preferences_register_enumerations (void) * populate widgets and route preferences changes between the * storage (MateConf) 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)); @@ -610,7 +593,7 @@ caja_global_preferences_get_default_folder_viewer_preference_as_iid (void) const char *viewer_iid; preference_value = - eel_preferences_get_enum (CAJA_PREFERENCES_DEFAULT_FOLDER_VIEWER); + g_settings_get_enum (caja_preferences, CAJA_PREFERENCES_DEFAULT_FOLDER_VIEWER); if (preference_value == CAJA_DEFAULT_FOLDER_VIEWER_LIST_VIEW) { diff --git a/libcaja-private/caja-global-preferences.h b/libcaja-private/caja-global-preferences.h index 6489a3c4..07301a76 100644 --- a/libcaja-private/caja-global-preferences.h +++ b/libcaja-private/caja-global-preferences.h @@ -118,7 +118,7 @@ G_BEGIN_DECLS #define CAJA_PREFERENCES_SORT_DIRECTORIES_FIRST "sort-directories-first" /* The default folder viewer - one of the two enums below */ -#define CAJA_PREFERENCES_DEFAULT_FOLDER_VIEWER "preferences/default_folder_viewer" +#define CAJA_PREFERENCES_DEFAULT_FOLDER_VIEWER "default-folder-viewer" enum { diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c index 66a0c72d..8bf337d2 100644 --- a/src/caja-file-management-properties.c +++ b/src/caja-file-management-properties.c @@ -76,9 +76,9 @@ static const char * const default_view_values[] = { - "icon_view", - "list_view", - "compact_view", + "icon-view", + "list-view", + "compact-view", NULL }; @@ -935,10 +935,10 @@ caja_file_management_properties_dialog_setup (GtkBuilder *builder, GtkWindow *wi CAJA_FILE_MANAGEMENT_PROPERTIES_TREE_VIEW_FOLDERS_WIDGET, CAJA_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES); - eel_preferences_builder_connect_string_enum_combo_box (builder, - CAJA_FILE_MANAGEMENT_PROPERTIES_DEFAULT_VIEW_WIDGET, - CAJA_PREFERENCES_DEFAULT_FOLDER_VIEWER, - (const char **) default_view_values); + bind_builder_enum (builder, caja_preferences, + CAJA_FILE_MANAGEMENT_PROPERTIES_DEFAULT_VIEW_WIDGET, + CAJA_PREFERENCES_DEFAULT_FOLDER_VIEWER, + (const char **) default_view_values); eel_preferences_builder_connect_string_enum_combo_box (builder, CAJA_FILE_MANAGEMENT_PROPERTIES_ICON_VIEW_ZOOM_WIDGET, CAJA_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL, |