start migration to gsettings

1 files changed, 8 insertions, 4 deletions

diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c
index 65ee3e12..86d1cce6 100644
--- a/src/file-manager/fm-desktop-icon-view.c
+++ b/src/file-manager/fm-desktop-icon-view.c
@@ -308,6 +308,10 @@ fm_desktop_icon_view_finalize (GObject *object)
                                      lockdown_disable_command_line_changed_callback,
                                      icon_view);
 
+    g_signal_handlers_disconnect_by_func (caja_preferences,
+                                          desktop_directory_changed_callback,
+                                          NULL);
+
     g_free (icon_view->details);
 
     G_OBJECT_CLASS (parent_class)->finalize (object);
@@ -531,7 +535,7 @@ fm_desktop_icon_view_update_icon_container_fonts (FMDesktopIconView *icon_view)
     icon_container = get_icon_container (icon_view);
     g_assert (icon_container != NULL);
 
-    font = eel_preferences_get (CAJA_PREFERENCES_DESKTOP_FONT);
+    font = g_settings_get_string (caja_preferences, CAJA_PREFERENCES_DESKTOP_FONT);
 
     caja_icon_container_set_font (icon_container, font);
 
@@ -547,9 +551,9 @@ fm_desktop_icon_view_init (FMDesktopIconView *desktop_icon_view)
 
     if (desktop_directory == NULL)
     {
-        eel_preferences_add_callback (CAJA_PREFERENCES_DESKTOP_IS_HOME_DIR,
-                                      desktop_directory_changed_callback,
-                                      NULL);
+        g_signal_connect_swapped (caja_preferences, "changed::" CAJA_PREFERENCES_DESKTOP_IS_HOME_DIR,
+                                  G_CALLBACK(desktop_directory_changed_callback),
+                                  NULL);
         desktop_directory_changed_callback (NULL);
     }