summaryrefslogtreecommitdiff
path: root/libcaja-private
diff options
context:
space:
mode:
Diffstat (limited to 'libcaja-private')
-rw-r--r--libcaja-private/caja-directory.c7
-rw-r--r--libcaja-private/caja-file.c9
-rw-r--r--libcaja-private/caja-global-preferences.c12
-rw-r--r--libcaja-private/caja-global-preferences.h2
4 files changed, 10 insertions, 20 deletions
diff --git a/libcaja-private/caja-directory.c b/libcaja-private/caja-directory.c
index 2318e409..faa6a22c 100644
--- a/libcaja-private/caja-directory.c
+++ b/libcaja-private/caja-directory.c
@@ -335,9 +335,10 @@ add_preferences_callbacks (void)
"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);
+ g_signal_connect_swapped (caja_preferences,
+ "changed::" CAJA_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS,
+ G_CALLBACK (async_data_preference_changed_callback),
+ NULL);
g_signal_connect_swapped (caja_preferences,
"changed::" CAJA_PREFERENCES_DATE_FORMAT,
G_CALLBACK(async_data_preference_changed_callback),
diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c
index e923e895..52bfaa50 100644
--- a/libcaja-private/caja-file.c
+++ b/libcaja-private/caja-file.c
@@ -4700,7 +4700,7 @@ show_text_in_icons_changed_callback (gpointer callback_data)
static void
show_directory_item_count_changed_callback (gpointer callback_data)
{
- show_directory_item_count = eel_preferences_get_enum (CAJA_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS);
+ show_directory_item_count = g_settings_get_enum (caja_preferences, CAJA_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS);
}
static gboolean
@@ -4752,9 +4752,10 @@ caja_file_should_show_directory_item_count (CajaFile *file)
/* Add the callback once for the life of our process */
if (!show_directory_item_count_callback_added) {
- eel_preferences_add_callback (CAJA_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS,
- show_directory_item_count_changed_callback,
- NULL);
+ g_signal_connect_swapped (caja_preferences,
+ "changed::" CAJA_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS,
+ G_CALLBACK(show_directory_item_count_changed_callback),
+ NULL);
show_directory_item_count_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 ee7edb54..490a8d4d 100644
--- a/libcaja-private/caja-global-preferences.c
+++ b/libcaja-private/caja-global-preferences.c
@@ -187,18 +187,6 @@ typedef struct
*/
static const PreferenceDefault preference_defaults[] =
{
- /* 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,
- * we should change this default to ALWAYS.
- */
- {
- CAJA_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS,
- PREFERENCE_STRING,
- "local_only",
- NULL, NULL,
- "speed_tradeoff"
- },
{
CAJA_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS,
PREFERENCE_STRING,
diff --git a/libcaja-private/caja-global-preferences.h b/libcaja-private/caja-global-preferences.h
index 6ffa0fdf..9f722214 100644
--- a/libcaja-private/caja-global-preferences.h
+++ b/libcaja-private/caja-global-preferences.h
@@ -199,7 +199,7 @@ G_BEGIN_DECLS
} CajaSpeedTradeoffValue;
#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_DIRECTORY_ITEM_COUNTS "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"
#define CAJA_PREFERENCES_PREVIEW_SOUND "preferences/preview_sound"