convert preview settings to gsettings

3 files changed, 17 insertions, 45 deletions

diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c
index 52bfaa50..0a2d8833 100644
--- a/libcaja-private/caja-file.c
+++ b/libcaja-private/caja-file.c
@@ -4041,7 +4041,7 @@ get_custom_icon (CajaFile *file)
 }
 
 
-static guint cached_thumbnail_limit;
+static guint64 cached_thumbnail_limit;
 int cached_thumbnail_size;
 static int show_image_thumbs;
 
@@ -8160,7 +8160,9 @@ caja_extract_top_left_text (const char *text,
 static void
 thumbnail_limit_changed_callback (gpointer user_data)
 {
-	cached_thumbnail_limit = eel_preferences_get_uint (CAJA_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT);
+	g_settings_get (caja_preferences,
+					CAJA_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT,
+					"t", &cached_thumbnail_limit);
 
 	/* Tell the world that icons might have changed. We could invent a narrower-scope
 	 * signal to mean only "thumbnails might have changed" if this ends up being slow
@@ -8184,7 +8186,7 @@ thumbnail_size_changed_callback (gpointer user_data)
 static void
 show_thumbnails_changed_callback (gpointer user_data)
 {
-	show_image_thumbs = eel_preferences_get_enum (CAJA_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS);
+	show_image_thumbs = g_settings_get_enum (caja_preferences, CAJA_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS);
 
 	/* Tell the world that icons might have changed. We could invent a narrower-scope
 	 * signal to mean only "thumbnails might have changed" if this ends up being slow
@@ -8281,17 +8283,19 @@ caja_file_class_init (CajaFileClass *class)
 				                  &date_format_pref);
 
 	thumbnail_limit_changed_callback (NULL);
-	eel_preferences_add_callback (CAJA_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT,
-				      thumbnail_limit_changed_callback,
-				      NULL);
+	g_signal_connect_swapped (caja_preferences,
+							  "changed::" CAJA_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT,
+							  G_CALLBACK (thumbnail_limit_changed_callback),
+							  NULL);
 	thumbnail_size_changed_callback (NULL);
 	eel_preferences_add_callback (CAJA_PREFERENCES_ICON_VIEW_THUMBNAIL_SIZE,
 				      thumbnail_size_changed_callback,
 				      NULL);
 	show_thumbnails_changed_callback (NULL);
-	eel_preferences_add_callback (CAJA_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS,
-				      show_thumbnails_changed_callback,
-				      NULL);
+	g_signal_connect_swapped (caja_preferences,
+							  "changed::" CAJA_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS,
+							  G_CALLBACK (show_thumbnails_changed_callback),
+							  NULL);
 
 	icon_theme = gtk_icon_theme_get_default ();
 	g_signal_connect_object (icon_theme,
diff --git a/libcaja-private/caja-global-preferences.c b/libcaja-private/caja-global-preferences.c
index 490a8d4d..27e3a543 100644
--- a/libcaja-private/caja-global-preferences.c
+++ b/libcaja-private/caja-global-preferences.c
@@ -64,14 +64,6 @@ typedef enum
     PREFERENCE_STRING_ARRAY
 } PreferenceType;
 
-/* Enumerations used to qualify some INTEGER preferences */
-static EelEnumerationEntry speed_tradeoff_enum_entries[] =
-{
-    { "always",	    N_("_Always"),		CAJA_SPEED_TRADEOFF_ALWAYS },
-    { "local_only",	    N_("_Local File Only"),	CAJA_SPEED_TRADEOFF_LOCAL_ONLY },
-    { "never",	    N_("_Never"),		CAJA_SPEED_TRADEOFF_NEVER }
-};
-
 static EelEnumerationEntry default_zoom_level_enum_entries[] =
 {
     /* xgettext:no-c-format */
@@ -188,27 +180,6 @@ typedef struct
 static const PreferenceDefault preference_defaults[] =
 {
     {
-        CAJA_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS,
-        PREFERENCE_STRING,
-        "local_only",
-        NULL, NULL,
-        "speed_tradeoff"
-    },
-    {
-        CAJA_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT,
-        PREFERENCE_INTEGER,
-        GINT_TO_POINTER(10485760),
-        NULL, NULL,
-        "file_size"
-    },
-    {
-        CAJA_PREFERENCES_PREVIEW_SOUND,
-        PREFERENCE_STRING,
-        "local_only",
-        NULL, NULL,
-        "speed_tradeoff"
-    },
-    {
         CAJA_PREFERENCES_ICON_VIEW_CAPTIONS,
         PREFERENCE_STRING_ARRAY,
         "size,date_modified,type",
@@ -434,9 +405,6 @@ global_preferences_register_enumerations (void)
     eel_enumeration_register ("file_size",
                               file_size_enum_entries,
                               G_N_ELEMENTS (file_size_enum_entries));
-    eel_enumeration_register ("speed_tradeoff",
-                              speed_tradeoff_enum_entries,
-                              G_N_ELEMENTS (speed_tradeoff_enum_entries));
     eel_enumeration_register ("standard_font_size",
                               standard_font_size_entries,
                               G_N_ELEMENTS (standard_font_size_entries));
diff --git a/libcaja-private/caja-global-preferences.h b/libcaja-private/caja-global-preferences.h
index 9f722214..fd15293e 100644
--- a/libcaja-private/caja-global-preferences.h
+++ b/libcaja-private/caja-global-preferences.h
@@ -198,11 +198,11 @@ G_BEGIN_DECLS
         CAJA_SPEED_TRADEOFF_NEVER
     } CajaSpeedTradeoffValue;
 
-#define CAJA_PREFERENCES_SHOW_TEXT_IN_ICONS		"show-icon-text"
+#define CAJA_PREFERENCES_SHOW_TEXT_IN_ICONS		    "show-icon-text"
 #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"
+#define CAJA_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS	"show-image-thumbnails"
+#define CAJA_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT	"thumbnail-limit"
+#define CAJA_PREFERENCES_PREVIEW_SOUND		        "preview-sound"
 
     typedef enum
     {