diff options
Diffstat (limited to 'libcaja-private')
| -rw-r--r-- | libcaja-private/caja-directory.c | 7 | ||||
| -rw-r--r-- | libcaja-private/caja-file.c | 6 | ||||
| -rw-r--r-- | libcaja-private/caja-global-preferences.c | 17 | ||||
| -rw-r--r-- | libcaja-private/caja-global-preferences.h | 2 |
4 files changed, 8 insertions, 24 deletions
diff --git a/libcaja-private/caja-directory.c b/libcaja-private/caja-directory.c index a3bc7fc0..cedd1a59 100644 --- a/libcaja-private/caja-directory.c +++ b/libcaja-private/caja-directory.c @@ -337,9 +337,10 @@ add_preferences_callbacks (void) eel_preferences_add_callback (CAJA_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS, async_data_preference_changed_callback, NULL); - eel_preferences_add_callback (CAJA_PREFERENCES_DATE_FORMAT, - async_data_preference_changed_callback, - NULL); + g_signal_connect_swapped (caja_preferences, + "changed::" CAJA_PREFERENCES_DATE_FORMAT, + G_CALLBACK(async_data_preference_changed_callback), + NULL); } /** diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c index 65bbaa38..988ff2e7 100644 --- a/libcaja-private/caja-file.c +++ b/libcaja-private/caja-file.c @@ -8274,9 +8274,9 @@ caja_file_class_init (CajaFileClass *class) g_type_class_add_private (class, sizeof (CajaFileDetails)); - - eel_preferences_add_auto_enum (CAJA_PREFERENCES_DATE_FORMAT, - &date_format_pref); + eel_g_settings_add_auto_enum (caja_preferences, + CAJA_PREFERENCES_DATE_FORMAT, + &date_format_pref); thumbnail_limit_changed_callback (NULL); eel_preferences_add_callback (CAJA_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT, diff --git a/libcaja-private/caja-global-preferences.c b/libcaja-private/caja-global-preferences.c index e9f4f255..703a4c29 100644 --- a/libcaja-private/caja-global-preferences.c +++ b/libcaja-private/caja-global-preferences.c @@ -183,13 +183,6 @@ static EelEnumerationEntry standard_font_size_entries[] = }; /* These are not translated, because the text is not used in the ui */ -static EelEnumerationEntry date_format_entries[] = -{ - { "locale", "Locale Default", CAJA_DATE_FORMAT_LOCALE }, - { "iso", "ISO Format", CAJA_DATE_FORMAT_ISO }, - { "informal", "Informal", CAJA_DATE_FORMAT_INFORMAL } -}; - static EelEnumerationEntry new_tab_position_entries[] = { { "after_current_tab", "After Current Tab", CAJA_NEW_TAB_POSITION_AFTER_CURRENT_TAB }, @@ -391,13 +384,6 @@ static const PreferenceDefault preference_defaults[] = GINT_TO_POINTER (TRUE) }, { - CAJA_PREFERENCES_DATE_FORMAT, - PREFERENCE_STRING, - "locale", - NULL, NULL, - "date_format" - }, - { CAJA_PREFERENCES_DEFAULT_FOLDER_VIEWER, PREFERENCE_INTEGER, GINT_TO_POINTER (CAJA_DEFAULT_FOLDER_VIEWER_ICON_VIEW), @@ -651,9 +637,6 @@ global_preferences_register_enumerations (void) eel_enumeration_register ("standard_font_size", standard_font_size_entries, G_N_ELEMENTS (standard_font_size_entries)); - eel_enumeration_register ("date_format", - date_format_entries, - G_N_ELEMENTS (date_format_entries)); eel_enumeration_register ("new_tab_position", new_tab_position_entries, G_N_ELEMENTS (new_tab_position_entries)); diff --git a/libcaja-private/caja-global-preferences.h b/libcaja-private/caja-global-preferences.h index 23ddd328..cb99bddb 100644 --- a/libcaja-private/caja-global-preferences.h +++ b/libcaja-private/caja-global-preferences.h @@ -69,7 +69,7 @@ G_BEGIN_DECLS /* Display */ #define CAJA_PREFERENCES_SHOW_HIDDEN_FILES "show-hidden-files" #define CAJA_PREFERENCES_SHOW_ADVANCED_PERMISSIONS "show-advanced-permissions" -#define CAJA_PREFERENCES_DATE_FORMAT "preferences/date_format" +#define CAJA_PREFERENCES_DATE_FORMAT "date-format" /* Mouse */ #define CAJA_PREFERENCES_MOUSE_USE_EXTRA_BUTTONS "preferences/mouse_use_extra_buttons" |