From 562875c2ed80bd7501fb161564ab88c731ac497c Mon Sep 17 00:00:00 2001 From: Stefano Karapetsas Date: Wed, 5 Sep 2012 16:55:12 +0200 Subject: convert show-directory-item-counts to gsettings --- src/caja-file-management-properties.c | 8 ++++---- src/caja-sidebar-title.c | 11 +++++++---- 2 files changed, 11 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c index f9e82af6..2b57f7a6 100644 --- a/src/caja-file-management-properties.c +++ b/src/caja-file-management-properties.c @@ -970,10 +970,10 @@ caja_file_management_properties_dialog_setup (GtkBuilder *builder, GtkWindow *wi CAJA_FILE_MANAGEMENT_PROPERTIES_PREVIEW_SOUND_WIDGET, CAJA_PREFERENCES_PREVIEW_SOUND, (const char **) preview_values); - eel_preferences_builder_connect_string_enum_combo_box (builder, - CAJA_FILE_MANAGEMENT_PROPERTIES_PREVIEW_FOLDER_WIDGET, - CAJA_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS, - (const char **) preview_values); + bind_builder_enum (builder, caja_preferences, + CAJA_FILE_MANAGEMENT_PROPERTIES_PREVIEW_FOLDER_WIDGET, + CAJA_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS, + (const char **) preview_values); bind_builder_enum (builder, caja_preferences, CAJA_FILE_MANAGEMENT_PROPERTIES_DATE_FORMAT_WIDGET, CAJA_PREFERENCES_DATE_FORMAT, diff --git a/src/caja-sidebar-title.c b/src/caja-sidebar-title.c index 1e334677..15a761be 100644 --- a/src/caja-sidebar-title.c +++ b/src/caja-sidebar-title.c @@ -165,10 +165,10 @@ caja_sidebar_title_init (CajaSidebarTitle *sidebar_title) /* initialize the label colors & fonts */ style_set (GTK_WIDGET (sidebar_title), NULL); - eel_preferences_add_callback_while_alive ( - CAJA_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS, - (EelPreferencesCallback) update_more_info, - sidebar_title, G_OBJECT (sidebar_title)); + g_signal_connect_swapped (caja_preferences, + "changed::" CAJA_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS, + G_CALLBACK(update_more_info), + sidebar_title); } /* destroy by throwing away private storage */ @@ -206,6 +206,9 @@ caja_sidebar_title_destroy (GtkObject *object) sidebar_title->details = NULL; } + g_signal_handlers_disconnect_by_func (caja_preferences, + update_more_info, sidebar_title); + EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } -- cgit v1.2.1