diff options
| -rw-r--r-- | libcaja-private/caja-directory.c | 7 | ||||
| -rw-r--r-- | libcaja-private/caja-file.c | 9 | ||||
| -rw-r--r-- | libcaja-private/caja-global-preferences.c | 7 | ||||
| -rw-r--r-- | libcaja-private/caja-global-preferences.h | 2 | ||||
| -rw-r--r-- | src/caja-file-management-properties.c | 10 |
5 files changed, 15 insertions, 20 deletions
diff --git a/libcaja-private/caja-directory.c b/libcaja-private/caja-directory.c index cedd1a59..2318e409 100644 --- a/libcaja-private/caja-directory.c +++ b/libcaja-private/caja-directory.c @@ -331,9 +331,10 @@ add_preferences_callbacks (void) "changed::" CAJA_PREFERENCES_SHOW_HIDDEN_FILES, G_CALLBACK(filtering_changed_callback), NULL); - eel_preferences_add_callback (CAJA_PREFERENCES_SHOW_TEXT_IN_ICONS, - async_data_preference_changed_callback, - NULL); + g_signal_connect_swapped (caja_preferences, + "changed::" CAJA_PREFERENCES_SHOW_TEXT_IN_ICONS, + G_CALLBACK (async_data_preference_changed_callback), + NULL); eel_preferences_add_callback (CAJA_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS, async_data_preference_changed_callback, NULL); diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c index 988ff2e7..e923e895 100644 --- a/libcaja-private/caja-file.c +++ b/libcaja-private/caja-file.c @@ -4694,7 +4694,7 @@ static CajaSpeedTradeoffValue show_text_in_icons; static void show_text_in_icons_changed_callback (gpointer callback_data) { - show_text_in_icons = eel_preferences_get_enum (CAJA_PREFERENCES_SHOW_TEXT_IN_ICONS); + show_text_in_icons = g_settings_get_enum (caja_preferences, CAJA_PREFERENCES_SHOW_TEXT_IN_ICONS); } static void @@ -4790,9 +4790,10 @@ caja_file_should_get_top_left_text (CajaFile *file) /* Add the callback once for the life of our process */ if (!show_text_in_icons_callback_added) { - eel_preferences_add_callback (CAJA_PREFERENCES_SHOW_TEXT_IN_ICONS, - show_text_in_icons_changed_callback, - NULL); + g_signal_connect_swapped (caja_preferences, + "changed::" CAJA_PREFERENCES_SHOW_TEXT_IN_ICONS, + G_CALLBACK (show_text_in_icons_changed_callback), + NULL); show_text_in_icons_callback_added = TRUE; /* Peek for the first time */ diff --git a/libcaja-private/caja-global-preferences.c b/libcaja-private/caja-global-preferences.c index d2c68b0a..ee7edb54 100644 --- a/libcaja-private/caja-global-preferences.c +++ b/libcaja-private/caja-global-preferences.c @@ -187,13 +187,6 @@ typedef struct */ static const PreferenceDefault preference_defaults[] = { - { - CAJA_PREFERENCES_SHOW_TEXT_IN_ICONS, - PREFERENCE_STRING, - "local_only", - NULL, NULL, - "speed_tradeoff" - }, /* Don't show remote directory item counts by default * because computing them can be annoyingly slow, especially * for FTP. If we make this fast enough for FTP in particular, diff --git a/libcaja-private/caja-global-preferences.h b/libcaja-private/caja-global-preferences.h index 050ae054..6ffa0fdf 100644 --- a/libcaja-private/caja-global-preferences.h +++ b/libcaja-private/caja-global-preferences.h @@ -198,7 +198,7 @@ G_BEGIN_DECLS CAJA_SPEED_TRADEOFF_NEVER } CajaSpeedTradeoffValue; -#define CAJA_PREFERENCES_SHOW_TEXT_IN_ICONS "preferences/show_icon_text" +#define CAJA_PREFERENCES_SHOW_TEXT_IN_ICONS "show-icon-text" #define CAJA_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS "preferences/show_directory_item_counts" #define CAJA_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS "preferences/show_image_thumbnails" #define CAJA_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT "preferences/thumbnail_limit" diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c index 8bf337d2..f9e82af6 100644 --- a/src/caja-file-management-properties.c +++ b/src/caja-file-management-properties.c @@ -115,7 +115,7 @@ static const char * const date_format_values[] = static const char * const preview_values[] = { "always", - "local_only", + "local-only", "never", NULL }; @@ -958,10 +958,10 @@ caja_file_management_properties_dialog_setup (GtkBuilder *builder, GtkWindow *wi eel_preferences_builder_connect_string_enum_combo_box_slave (builder, CAJA_FILE_MANAGEMENT_PROPERTIES_SORT_ORDER_WIDGET, CAJA_PREFERENCES_LIST_VIEW_DEFAULT_SORT_ORDER); - eel_preferences_builder_connect_string_enum_combo_box (builder, - CAJA_FILE_MANAGEMENT_PROPERTIES_PREVIEW_TEXT_WIDGET, - CAJA_PREFERENCES_SHOW_TEXT_IN_ICONS, - (const char **) preview_values); + bind_builder_enum (builder, caja_preferences, + CAJA_FILE_MANAGEMENT_PROPERTIES_PREVIEW_TEXT_WIDGET, + CAJA_PREFERENCES_SHOW_TEXT_IN_ICONS, + (const char **) preview_values); eel_preferences_builder_connect_string_enum_combo_box (builder, CAJA_FILE_MANAGEMENT_PROPERTIES_PREVIEW_IMAGE_WIDGET, CAJA_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS, |