From 6f15dc7cc1be8b98bbc1f5edd963ff89076295ee Mon Sep 17 00:00:00 2001
From: Stefano Karapetsas <stefano@karapetsas.com>
Date: Wed, 5 Sep 2012 12:36:04 +0200
Subject: start migration to gsettings

---
 libcaja-private/caja-autorun.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'libcaja-private/caja-autorun.c')

diff --git a/libcaja-private/caja-autorun.c b/libcaja-private/caja-autorun.c
index 78340c5e..cf801b08 100644
--- a/libcaja-private/caja-autorun.c
+++ b/libcaja-private/caja-autorun.c
@@ -83,9 +83,9 @@ caja_autorun_get_preferences (const char *x_content_type,
     *pref_start_app = FALSE;
     *pref_ignore = FALSE;
     *pref_open_folder = FALSE;
-    x_content_start_app = eel_preferences_get_string_array (CAJA_PREFERENCES_MEDIA_AUTORUN_X_CONTENT_START_APP);
-    x_content_ignore = eel_preferences_get_string_array (CAJA_PREFERENCES_MEDIA_AUTORUN_X_CONTENT_IGNORE);
-    x_content_open_folder = eel_preferences_get_string_array (CAJA_PREFERENCES_MEDIA_AUTORUN_X_CONTENT_OPEN_FOLDER);
+    x_content_start_app = g_settings_get_strv (caja_media_preferences, CAJA_PREFERENCES_MEDIA_AUTORUN_X_CONTENT_START_APP);
+    x_content_ignore = g_settings_get_strv (caja_media_preferences, CAJA_PREFERENCES_MEDIA_AUTORUN_X_CONTENT_IGNORE);
+    x_content_open_folder = g_settings_get_strv (caja_media_preferences, CAJA_PREFERENCES_MEDIA_AUTORUN_X_CONTENT_OPEN_FOLDER);
     if (x_content_start_app != NULL)
     {
         *pref_start_app = eel_g_strv_find (x_content_start_app, x_content_type) != -1;
@@ -156,30 +156,30 @@ caja_autorun_set_preferences (const char *x_content_type,
 
     g_assert (x_content_type != NULL);
 
-    x_content_start_app = eel_preferences_get_string_array (CAJA_PREFERENCES_MEDIA_AUTORUN_X_CONTENT_START_APP);
-    x_content_ignore = eel_preferences_get_string_array (CAJA_PREFERENCES_MEDIA_AUTORUN_X_CONTENT_IGNORE);
-    x_content_open_folder = eel_preferences_get_string_array (CAJA_PREFERENCES_MEDIA_AUTORUN_X_CONTENT_OPEN_FOLDER);
+    x_content_start_app = g_settings_get_strv (caja_media_preferences, CAJA_PREFERENCES_MEDIA_AUTORUN_X_CONTENT_START_APP);
+    x_content_ignore = g_settings_get_strv (caja_media_preferences, CAJA_PREFERENCES_MEDIA_AUTORUN_X_CONTENT_IGNORE);
+    x_content_open_folder = g_settings_get_strv (caja_media_preferences, CAJA_PREFERENCES_MEDIA_AUTORUN_X_CONTENT_OPEN_FOLDER);
 
     remove_elem_from_str_array (x_content_start_app, x_content_type);
     if (pref_start_app)
     {
         x_content_start_app = add_elem_to_str_array (x_content_start_app, x_content_type);
     }
-    eel_preferences_set_string_array (CAJA_PREFERENCES_MEDIA_AUTORUN_X_CONTENT_START_APP, x_content_start_app);
+    g_settings_set_strv (caja_media_preferences, CAJA_PREFERENCES_MEDIA_AUTORUN_X_CONTENT_START_APP, (const gchar * const*) x_content_start_app);
 
     remove_elem_from_str_array (x_content_ignore, x_content_type);
     if (pref_ignore)
     {
         x_content_ignore = add_elem_to_str_array (x_content_ignore, x_content_type);
     }
-    eel_preferences_set_string_array (CAJA_PREFERENCES_MEDIA_AUTORUN_X_CONTENT_IGNORE, x_content_ignore);
+    g_settings_set_strv (caja_media_preferences, CAJA_PREFERENCES_MEDIA_AUTORUN_X_CONTENT_IGNORE, (const gchar * const*) x_content_ignore);
 
     remove_elem_from_str_array (x_content_open_folder, x_content_type);
     if (pref_open_folder)
     {
         x_content_open_folder = add_elem_to_str_array (x_content_open_folder, x_content_type);
     }
-    eel_preferences_set_string_array (CAJA_PREFERENCES_MEDIA_AUTORUN_X_CONTENT_OPEN_FOLDER, x_content_open_folder);
+    g_settings_set_strv (caja_media_preferences, CAJA_PREFERENCES_MEDIA_AUTORUN_X_CONTENT_OPEN_FOLDER, (const gchar * const*) x_content_open_folder);
 
     g_strfreev (x_content_open_folder);
     g_strfreev (x_content_ignore);
@@ -1217,7 +1217,7 @@ autorun_guessed_content_type_callback (GObject *source_object,
         }
         else
         {
-            if (eel_preferences_get_boolean (CAJA_PREFERENCES_MEDIA_AUTOMOUNT_OPEN))
+            if (g_settings_get_boolean (caja_media_preferences, CAJA_PREFERENCES_MEDIA_AUTOMOUNT_OPEN))
                 open_folder = TRUE;
         }
     }
@@ -1238,7 +1238,7 @@ caja_autorun (GMount *mount, CajaAutorunOpenWindow open_window_func, gpointer us
     AutorunData *data;
 
     if (!should_autorun_mount (mount) ||
-            eel_preferences_get_boolean (CAJA_PREFERENCES_MEDIA_AUTORUN_NEVER))
+            g_settings_get_boolean (caja_media_preferences, CAJA_PREFERENCES_MEDIA_AUTORUN_NEVER))
     {
         return;
     }
-- 
cgit v1.2.1