[directory-bg] rewrite/refactor, untangle directory & desktop bg-setting code

- Fixes crashes when resizing a VM window in VirtualBox.
- Adds a method to allow handling desktop reset.

3 files changed, 250 insertions, 513 deletions

diff --git a/libcaja-private/caja-directory-background.c b/libcaja-private/caja-directory-background.c
index a445aab7..58e78d72 100644
--- a/libcaja-private/caja-directory-background.c
+++ b/libcaja-private/caja-directory-background.c
@@ -2,9 +2,10 @@
 
 /*
    caja-directory-background.c: Helper for the background of a widget
-                                    that is viewing a particular location.
+                                that is viewing a particular location.
 
    Copyright (C) 2000 Eazel, Inc.
+   Copyright (C) 2012 Jasmine Hassan <[email protected]>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -21,7 +22,8 @@
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
    Boston, MA 02110-1301, USA.
 
-   Author: Darin Adler <[email protected]>
+   Authors: Darin Adler <[email protected]>
+            Jasmine Hassan <[email protected]>
 */
 
 #include <config.h>
@@ -36,553 +38,203 @@
 #include "caja-file-attributes.h"
 #include <gtk/gtk.h>
 #include <string.h>
+#define MATE_DESKTOP_USE_UNSTABLE_API
+#include <libmateui/mate-bg.h>
 
-static void background_changed_callback     (EelBackground *background,
-        GdkDragAction  action,
-        CajaFile  *file);
-static void background_reset_callback       (EelBackground *background,
-        CajaFile       *file);
-
-static void saved_settings_changed_callback (CajaFile       *file,
-        EelBackground *background);
-
-static void caja_file_background_receive_settings_changes (EelBackground *background);
-
-static void caja_file_background_theme_changed (GSettings   *settings,
-                                                const gchar *key,
-                                                gpointer     user_data);
-
-void
-caja_connect_desktop_background_to_file_metadata (CajaIconContainer *icon_container,
-        CajaFile *file)
-{
-    EelBackground *background;
-
-    background = eel_get_widget_background (GTK_WIDGET (icon_container));
-
-    eel_background_set_desktop (background, GTK_WIDGET (icon_container), TRUE);
-
-    /* Strictly speaking, we don't need to know about metadata changes, since
-     * the desktop setting aren't stored there. But, hooking up to metadata
-     * changes is actually a small part of what this fn does, and we do need
-     * the other stuff (hooked up to background & theme changes, initialize
-     * the background). Being notified of metadata changes on the file is a
-     * waste, but won't hurt, so I don't think it's worth refactoring the fn
-     * at this point.
-     */
-    caja_connect_background_to_file_metadata (GTK_WIDGET (icon_container), file, CAJA_DND_ACTION_SET_AS_FOLDER_BACKGROUND);
-
-    caja_file_background_receive_settings_changes (background);
-}
+static void caja_background_changed_cb (EelBackground *background,
+                                        GdkDragAction  action,
+                                        CajaFile      *file);
 
 static void
-caja_file_background_get_default_settings (char **color,
-        char **image,
-        EelBackgroundImagePlacement *placement)
+caja_background_get_default_settings (char **color,
+                                      char **image)
 {
     gboolean background_set;
 
     background_set = g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_BACKGROUND_SET);
 
     if (background_set && color)
-    {
         *color = g_settings_get_string (caja_preferences, CAJA_PREFERENCES_BACKGROUND_COLOR);
-    }
 
     if (background_set && image)
-    {
         *image =  g_settings_get_string (caja_preferences, CAJA_PREFERENCES_BACKGROUND_URI);
-    }
-
-    if (placement)
-    {
-        *placement = EEL_BACKGROUND_TILED;
-    }
 }
 
-
-#define BG_PREFERENCES_DRAW_BACKGROUND    "draw-background"
-#define BG_PREFERENCES_PRIMARY_COLOR      "primary-color"
-#define BG_PREFERENCES_SECONDARY_COLOR    "secondary-color"
-#define BG_PREFERENCES_COLOR_SHADING_TYPE "color-shading-type"
-#define BG_PREFERENCES_PICTURE_OPTIONS    "picture-options"
-#define BG_PREFERENCES_PICTURE_OPACITY    "picture-opacity"
-#define BG_PREFERENCES_PICTURE_FILENAME   "picture-filename"
-
 static void
-read_color (const char *key, GdkColor *color)
+caja_background_load_from_file_metadata (CajaFile      *file,
+                                         EelBackground *background)
 {
-    gchar *tmp;
-
-    tmp = g_settings_get_string (mate_background_preferences, key);
-
-    if (tmp != NULL)
-    {
-        if (!gdk_color_parse (tmp, color))
-            gdk_color_parse ("black", color);
-        g_free (tmp);
-    }
-    else
-    {
-        gdk_color_parse ("black", color);
-    }
-}
-
-static void
-caja_file_background_read_desktop_settings (char **color,
-        char **image,
-        EelBackgroundImagePlacement *placement)
-{
-    gboolean enabled;
-    GdkColor primary, secondary;
-    gchar *tmp, *filename;
-    char	*end_color;
-    char	*start_color;
-    gboolean use_gradient;
-    gboolean is_horizontal;
-
-    filename = NULL;
-
-    /* Get the image filename */
-    enabled = g_settings_get_boolean (mate_background_preferences, BG_PREFERENCES_DRAW_BACKGROUND);
-    if (enabled)
-    {
-        tmp = g_settings_get_string (mate_background_preferences, BG_PREFERENCES_PICTURE_FILENAME);
-        if (tmp != NULL)
-        {
-            if (g_utf8_validate (tmp, -1, NULL) && g_file_test (tmp, G_FILE_TEST_EXISTS))
-            {
-                filename = g_strdup (tmp);
-            }
-            else
-            {
-                filename = g_filename_from_utf8 (tmp, -1, NULL, NULL, NULL);
-            }
-        }
-        g_free (tmp);
-
-        if (filename != NULL && filename[0] != '\0')
-        {
-            *image = g_filename_to_uri (filename, NULL, NULL);
-        }
-        else
-        {
-            *image = NULL;
-        }
-        g_free (filename);
-    }
-    else
-    {
-        *image = NULL;
-    }
-
-    /* Get the placement */
-    tmp = g_settings_get_string (mate_background_preferences, BG_PREFERENCES_PICTURE_OPTIONS);
-    if (tmp != NULL)
-    {
-        if (strcmp (tmp, "wallpaper") == 0)
-        {
-            *placement = EEL_BACKGROUND_TILED;
-        }
-        else if (strcmp (tmp, "centered") == 0)
-        {
-            *placement = EEL_BACKGROUND_CENTERED;
-        }
-        else if (strcmp (tmp, "scaled") == 0)
-        {
-            *placement = EEL_BACKGROUND_SCALED_ASPECT;
-        }
-        else if (strcmp (tmp, "stretched") == 0)
-        {
-            *placement = EEL_BACKGROUND_SCALED;
-        }
-        else if (strcmp (tmp, "zoom") == 0)
-        {
-            *placement = EEL_BACKGROUND_ZOOM;
-        }
-        else if (strcmp (tmp, "spanned") == 0)
-        {
-            *placement = EEL_BACKGROUND_SPANNED;
-        }
-        else if (strcmp (tmp, "none") == 0)
-        {
-            g_free (*image);
-
-            *placement = EEL_BACKGROUND_CENTERED;
-            *image = NULL;
-        }
-        else
-        {
-            *placement = EEL_BACKGROUND_CENTERED;
-        }
-    }
-    else
-    {
-        *placement = EEL_BACKGROUND_CENTERED;
-    }
-    g_free (tmp);
-
-    /* Get the color */
-    tmp = g_settings_get_string (mate_background_preferences, BG_PREFERENCES_COLOR_SHADING_TYPE);
-    if (tmp != NULL)
-    {
-        if (strcmp (tmp, "solid") == 0)
-        {
-            use_gradient = FALSE;
-            is_horizontal = FALSE;
-        }
-        else if (strcmp (tmp, "vertical-gradient") == 0)
-        {
-            use_gradient = TRUE;
-            is_horizontal = FALSE;
-        }
-        else if (strcmp (tmp, "horizontal-gradient") == 0)
-        {
-            use_gradient = TRUE;
-            is_horizontal = TRUE;
-        }
-        else
-        {
-            use_gradient = FALSE;
-            is_horizontal = FALSE;
-        }
-    }
-    else
-    {
-        use_gradient = FALSE;
-        is_horizontal = FALSE;
-    }
-    g_free (tmp);
-
-    read_color (BG_PREFERENCES_PRIMARY_COLOR, &primary);
-    read_color (BG_PREFERENCES_SECONDARY_COLOR, &secondary);
+    char *color, *image;
 
-    start_color   = eel_gdk_rgb_to_color_spec (eel_gdk_color_to_rgb (&primary));
-    end_color     = eel_gdk_rgb_to_color_spec (eel_gdk_color_to_rgb (&secondary));
+    g_assert (EEL_IS_BACKGROUND (background));
+    g_assert (CAJA_IS_FILE (file));
+    g_assert (g_object_get_data (G_OBJECT (background), "eel_background_file") == file);
 
-    if (use_gradient)
-    {
-        *color = eel_gradient_new (start_color, end_color, is_horizontal);
-    }
-    else
-    {
-        *color = g_strdup (start_color);
-    }
+    color = caja_file_get_metadata (file, CAJA_METADATA_KEY_LOCATION_BACKGROUND_COLOR, NULL);
+    image = caja_file_get_metadata (file, CAJA_METADATA_KEY_LOCATION_BACKGROUND_IMAGE, NULL);
 
-    g_free (start_color);
-    g_free (end_color);
-}
+    /* if there's none, read the default from the theme */
+    if (color == NULL && image == NULL)
+        caja_background_get_default_settings (&color, &image);
 
-static int
-call_settings_changed (EelBackground *background)
-{
-    CajaFile *file;
-    file = g_object_get_data (G_OBJECT (background), "eel_background_file");
-    if (file)
-    {
-        saved_settings_changed_callback (file, background);
-    }
-    return FALSE;
-}
+    /* Block the other handler while we are responding to changes
+     * in the metadata so it doesn't try to change the metadata.
+     */
+    g_signal_handlers_block_by_func (background, G_CALLBACK (caja_background_changed_cb), file);
 
-static void
-desktop_background_settings_notify_cb (GSettings *settings, gchar *key, gpointer data)
-{
-    EelBackground *background;
+    eel_background_set_color (background, color);
+    /* non-tiled only available for desktop, at least for now */
+    eel_bg_set_placement (background, MATE_BG_PLACEMENT_TILED);
+    eel_background_set_image_uri (background, image);
 
-    background = EEL_BACKGROUND (data);
+    /* Unblock the handler. */
+    g_signal_handlers_unblock_by_func (background, G_CALLBACK (caja_background_changed_cb), file);
 
-    call_settings_changed (background);
+    g_free (color);
+    g_free (image);
 }
 
+/* handle the file changed signal */
 static void
-desktop_background_weak_notify (gpointer data,
-                                GObject *object)
+caja_background_settings_notify_cb (CajaFile *file,
+                                    EelBackground *background)
 {
-    g_signal_handlers_disconnect_by_func(mate_background_preferences,
-                                         G_CALLBACK (desktop_background_settings_notify_cb),
-                                         object);
+    caja_background_load_from_file_metadata (file, background);
 }
 
+/* handle the theme changing */
 static void
-caja_file_background_receive_settings_changes (EelBackground *background)
+caja_background_theme_notify_cb (GSettings   *settings,
+                                 const gchar *key,
+                                 gpointer     user_data)
 {
-    g_signal_connect (mate_background_preferences,
-                      "changed",
-                      G_CALLBACK (desktop_background_settings_notify_cb),
-                      G_OBJECT (background));
-
-    g_object_weak_ref (G_OBJECT (background),
-                      desktop_background_weak_notify, NULL);
-}
-
-/* return true if the background is not in the default state */
-gboolean
-caja_file_background_is_set (EelBackground *background)
-{
-    char *color;
-    char *image;
-
-    gboolean is_set;
-
-    color = eel_background_get_color (background);
-    image = eel_background_get_image_uri (background);
-
-    is_set = (color || image);
+    CajaFile *file;
+    EelBackground *background = EEL_BACKGROUND (user_data);
 
-    g_free (color);
-    g_free (image);
+    file = g_object_get_data (G_OBJECT (background), "eel_background_file");
 
-    return is_set;
+    if (file)
+        caja_background_settings_notify_cb (file, background);
 }
 
 /* handle the background changed signal */
 static void
-background_changed_callback (EelBackground *background,
-                             GdkDragAction  action,
-                             CajaFile   *file)
+caja_background_changed_cb (EelBackground *background,
+                            GdkDragAction  action,
+                            CajaFile   *file)
 {
-    char *color;
-    char *image;
-
     g_assert (EEL_IS_BACKGROUND (background));
     g_assert (CAJA_IS_FILE (file));
     g_assert (g_object_get_data (G_OBJECT (background), "eel_background_file") == file);
 
+    char *color = eel_background_get_color (background);
+    char *image = eel_background_get_image_uri (background);
 
-    color = eel_background_get_color (background);
-    image = eel_background_get_image_uri (background);
+    /* Block the other handler while we are writing metadata so it doesn't
+     * try to change the background.
+     */
+    g_signal_handlers_block_by_func (file, G_CALLBACK (caja_background_settings_notify_cb),
+                                     background);
 
-    if (eel_background_is_desktop (background))
+    if (action != (GdkDragAction) CAJA_DND_ACTION_SET_AS_FOLDER_BACKGROUND &&
+            action != (GdkDragAction) CAJA_DND_ACTION_SET_AS_GLOBAL_BACKGROUND)
     {
-        eel_background_save_to_settings (background);
+        action = (GdkDragAction) GPOINTER_TO_INT (g_object_get_data (G_OBJECT (background),
+                                                  "default_drag_action"));
     }
-    else
+
+    if (action == (GdkDragAction) CAJA_DND_ACTION_SET_AS_GLOBAL_BACKGROUND)
     {
-        /* Block the other handler while we are writing metadata so it doesn't
-         * try to change the background.
-         */
-        g_signal_handlers_block_by_func (
-            file, G_CALLBACK (saved_settings_changed_callback), background);
-
-        if (action != (GdkDragAction) CAJA_DND_ACTION_SET_AS_FOLDER_BACKGROUND &&
-                action != (GdkDragAction) CAJA_DND_ACTION_SET_AS_GLOBAL_BACKGROUND)
-        {
-            GdkDragAction default_drag_action;
-
-            default_drag_action = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (background), "default_drag_action"));
-
-
-            action = default_drag_action;
-        }
-
-        if (action == (GdkDragAction) CAJA_DND_ACTION_SET_AS_GLOBAL_BACKGROUND)
-        {
-            caja_file_set_metadata (file,
-                                    CAJA_METADATA_KEY_LOCATION_BACKGROUND_COLOR,
-                                    NULL,
-                                    NULL);
-
-            caja_file_set_metadata (file,
-                                    CAJA_METADATA_KEY_LOCATION_BACKGROUND_IMAGE,
-                                    NULL,
-                                    NULL);
-
-            g_signal_handlers_block_by_func (caja_preferences, G_CALLBACK (caja_file_background_theme_changed), background);
-
-            g_settings_set_string (caja_preferences,
-                                   CAJA_PREFERENCES_BACKGROUND_COLOR, color ? color : "");
-            g_settings_set_string (caja_preferences,
-                                   CAJA_PREFERENCES_BACKGROUND_URI,
-                                   image ? image : "");
-            g_settings_set_boolean (caja_preferences,
-                                    CAJA_PREFERENCES_BACKGROUND_SET, TRUE);
-
-            g_signal_handlers_unblock_by_func (caja_preferences, G_CALLBACK (caja_file_background_theme_changed), background);
-        }
-        else
-        {
-            caja_file_set_metadata (file,
-                                    CAJA_METADATA_KEY_LOCATION_BACKGROUND_COLOR,
-                                    NULL,
-                                    color);
-
-            caja_file_set_metadata (file,
-                                    CAJA_METADATA_KEY_LOCATION_BACKGROUND_IMAGE,
-                                    NULL,
-                                    image);
-        }
-
-        /* Unblock the handler. */
-        g_signal_handlers_unblock_by_func (
-            file, G_CALLBACK (saved_settings_changed_callback), background);
+        caja_file_set_metadata (file, CAJA_METADATA_KEY_LOCATION_BACKGROUND_COLOR, NULL, NULL);
+        caja_file_set_metadata (file, CAJA_METADATA_KEY_LOCATION_BACKGROUND_IMAGE, NULL, NULL);
+
+        g_signal_handlers_block_by_func (caja_preferences,
+                                         G_CALLBACK (caja_background_theme_notify_cb),
+                                         background);
+
+        g_settings_set_string (caja_preferences,
+                               CAJA_PREFERENCES_BACKGROUND_COLOR, color ? color : "");
+        g_settings_set_string (caja_preferences,
+                               CAJA_PREFERENCES_BACKGROUND_URI, image ? image : "");
+
+        g_settings_set_boolean (caja_preferences, CAJA_PREFERENCES_BACKGROUND_SET, TRUE);
+
+        g_signal_handlers_unblock_by_func (caja_preferences,
+                                           G_CALLBACK (caja_background_theme_notify_cb),
+                                           background);
+    } else {
+        caja_file_set_metadata (file, CAJA_METADATA_KEY_LOCATION_BACKGROUND_COLOR, NULL, color);
+        caja_file_set_metadata (file, CAJA_METADATA_KEY_LOCATION_BACKGROUND_IMAGE, NULL, image);
     }
 
+    /* Unblock the handler. */
+    g_signal_handlers_unblock_by_func (file, G_CALLBACK (caja_background_settings_notify_cb),
+                                       background);
+
     g_free (color);
     g_free (image);
 }
 
+/* handle the background reset signal by setting values from the current theme */
 static void
-initialize_background_from_settings (CajaFile *file,
-                                     EelBackground *background)
+caja_background_reset_cb (EelBackground *background,
+                          CajaFile  *file)
 {
-    char *color;
-    char *image;
-    EelBackgroundImagePlacement placement;
+    char *color, *image;
 
-    g_assert (CAJA_IS_FILE (file));
-    g_assert (EEL_IS_BACKGROUND (background));
-    g_assert (g_object_get_data (G_OBJECT (background), "eel_background_file")
-              == file);
+    /* Block the other handler while we are writing metadata so it doesn't
+     * try to change the background.
+     */
+    g_signal_handlers_block_by_func (file, G_CALLBACK (caja_background_settings_notify_cb),
+                                     background);
 
-    if (eel_background_is_desktop (background))
+    color = caja_file_get_metadata (file, CAJA_METADATA_KEY_LOCATION_BACKGROUND_COLOR, NULL);
+    image = caja_file_get_metadata (file, CAJA_METADATA_KEY_LOCATION_BACKGROUND_IMAGE, NULL);
+    if (!color && !image)
     {
-        caja_file_background_read_desktop_settings (&color, &image, &placement);
+        g_signal_handlers_block_by_func (caja_preferences,
+                                         G_CALLBACK (caja_background_theme_notify_cb),
+                                         background);
+        g_settings_set_boolean (caja_preferences, CAJA_PREFERENCES_BACKGROUND_SET, FALSE);
+        g_signal_handlers_unblock_by_func (caja_preferences,
+                                           G_CALLBACK (caja_background_theme_notify_cb),
+                                           background);
     }
     else
     {
-        color = caja_file_get_metadata (file,
-                                        CAJA_METADATA_KEY_LOCATION_BACKGROUND_COLOR,
-                                        NULL);
-        image = caja_file_get_metadata (file,
-                                        CAJA_METADATA_KEY_LOCATION_BACKGROUND_IMAGE,
-                                        NULL);
-        placement = EEL_BACKGROUND_TILED; /* non-tiled only avail for desktop, at least for now */
-
-        /* if there's none, read the default from the theme */
-        if (color == NULL && image == NULL)
-        {
-            caja_file_background_get_default_settings
-            (&color, &image, &placement);
-        }
+        /* reset the metadata */
+        caja_file_set_metadata (file, CAJA_METADATA_KEY_LOCATION_BACKGROUND_COLOR, NULL, NULL);
+        caja_file_set_metadata (file, CAJA_METADATA_KEY_LOCATION_BACKGROUND_IMAGE, NULL, NULL);
     }
-
-    /* Block the other handler while we are responding to changes
-     * in the metadata so it doesn't try to change the metadata.
-     */
-    g_signal_handlers_block_by_func
-    (background,
-     G_CALLBACK (background_changed_callback),
-     file);
-
-    eel_background_set_color (background, color);
-    eel_background_set_image_uri (background, image);
-    eel_background_set_image_placement (background, placement);
-
-    /* Unblock the handler. */
-    g_signal_handlers_unblock_by_func
-    (background,
-     G_CALLBACK (background_changed_callback),
-     file);
-
     g_free (color);
     g_free (image);
-}
 
-/* handle the file changed signal */
-static void
-saved_settings_changed_callback (CajaFile *file,
-                                 EelBackground *background)
-{
-    initialize_background_from_settings (file, background);
-}
-
-/* handle the theme changing */
-static void
-caja_file_background_theme_changed (GSettings   *settings,
-                                    const gchar *key,
-                                    gpointer     user_data)
-{
-    CajaFile *file;
-    EelBackground *background;
-
-    background = EEL_BACKGROUND (user_data);
-    file = g_object_get_data (G_OBJECT (background), "eel_background_file");
-    if (file)
-    {
-        saved_settings_changed_callback (file, background);
-    }
-}
-
-/* handle the background reset signal by setting values from the current theme */
-static void
-background_reset_callback (EelBackground *background,
-                           CajaFile  *file)
-{
-    char *color;
-    char *image;
-
-    if (!eel_background_is_desktop (background))
-    {
-        /* Block the other handler while we are writing metadata so it doesn't
-         * try to change the background.
-         */
-        g_signal_handlers_block_by_func (
-            file,
-            G_CALLBACK (saved_settings_changed_callback),
-            background);
-
-        color = caja_file_get_metadata (file,
-                                        CAJA_METADATA_KEY_LOCATION_BACKGROUND_COLOR,
-                                        NULL);
-        image = caja_file_get_metadata (file,
-                                        CAJA_METADATA_KEY_LOCATION_BACKGROUND_IMAGE,
-                                        NULL);
-        if (!color && !image)
-        {
-            g_signal_handlers_block_by_func (caja_preferences, G_CALLBACK (caja_file_background_theme_changed), background);
-            g_settings_set_boolean (caja_preferences,
-                                    CAJA_PREFERENCES_BACKGROUND_SET,
-                                    FALSE);
-            g_signal_handlers_unblock_by_func (caja_preferences, G_CALLBACK (caja_file_background_theme_changed), background);
-        }
-        else
-        {
-            /* reset the metadata */
-            caja_file_set_metadata (file,
-                                    CAJA_METADATA_KEY_LOCATION_BACKGROUND_COLOR,
-                                    NULL,
-                                    NULL);
-
-            caja_file_set_metadata (file,
-                                    CAJA_METADATA_KEY_LOCATION_BACKGROUND_IMAGE,
-                                    NULL,
-                                    NULL);
-        }
-        g_free (color);
-        g_free (image);
-
-        /* Unblock the handler. */
-        g_signal_handlers_unblock_by_func (
-            file,
-            G_CALLBACK (saved_settings_changed_callback),
-            background);
-    }
+    /* Unblock the handler. */
+    g_signal_handlers_unblock_by_func (file, G_CALLBACK (caja_background_settings_notify_cb),
+                                       background);
 
-    saved_settings_changed_callback (file, background);
+    caja_background_settings_notify_cb (file, background);
 }
 
 /* handle the background destroyed signal */
 static void
-background_weak_notify (gpointer data,
-                        GObject *background)
+caja_background_weak_notify (gpointer data,
+                             GObject *background)
 {
     CajaFile *file = CAJA_FILE (data);
 
-    g_signal_handlers_disconnect_by_func
-    (file,
-     G_CALLBACK (saved_settings_changed_callback), background);
+    g_signal_handlers_disconnect_by_func (file, G_CALLBACK (caja_background_settings_notify_cb),
+                                          background);
     caja_file_monitor_remove (file, background);
-    g_signal_handlers_disconnect_by_func (caja_preferences,
-                                          caja_file_background_theme_changed,
+    g_signal_handlers_disconnect_by_func (caja_preferences, caja_background_theme_notify_cb,
                                           background);
 }
 
 /* key routine that hooks up a background and location */
 void
-caja_connect_background_to_file_metadata (GtkWidget    *widget,
-        CajaFile *file,
-        GdkDragAction default_drag_action)
+caja_connect_background_to_file_metadata (GtkWidget     *widget,
+                                          CajaFile      *file,
+                                          GdkDragAction  default_drag_action)
 {
     EelBackground *background;
     gpointer old_file;
@@ -593,9 +245,7 @@ caja_connect_background_to_file_metadata (GtkWidget    *widget,
     /* Check if it is already connected. */
     old_file = g_object_get_data (G_OBJECT (background), "eel_background_file");
     if (old_file == file)
-    {
         return;
-    }
 
     /* Disconnect old signal handlers. */
     if (old_file != NULL)
@@ -603,23 +253,19 @@ caja_connect_background_to_file_metadata (GtkWidget    *widget,
         g_assert (CAJA_IS_FILE (old_file));
 
         g_signal_handlers_disconnect_by_func (background,
-                                              G_CALLBACK (background_changed_callback),
-                                              old_file);
-
+                                              G_CALLBACK (caja_background_changed_cb), old_file);
         g_signal_handlers_disconnect_by_func (background,
-                                              G_CALLBACK (background_reset_callback),
-                                              old_file);
+                                              G_CALLBACK (caja_background_reset_cb), old_file);
 
-        g_object_weak_unref (G_OBJECT (background), background_weak_notify, old_file);
+        g_object_weak_unref (G_OBJECT (background), caja_background_weak_notify, old_file);
 
         g_signal_handlers_disconnect_by_func (old_file,
-                                              G_CALLBACK (saved_settings_changed_callback),
+                                              G_CALLBACK (caja_background_settings_notify_cb),
                                               background);
 
         caja_file_monitor_remove (old_file, background);
 
-        g_signal_handlers_disconnect_by_func (caja_preferences,
-                                              caja_file_background_theme_changed,
+        g_signal_handlers_disconnect_by_func (caja_preferences, caja_background_theme_notify_cb,
                                               background);
     }
 
@@ -628,42 +274,135 @@ caja_connect_background_to_file_metadata (GtkWidget    *widget,
     g_object_set_data_full (G_OBJECT (background), "eel_background_file",
                             file, (GDestroyNotify) caja_file_unref);
 
-    g_object_set_data (G_OBJECT (background), "default_drag_action", GINT_TO_POINTER (default_drag_action));
+    g_object_set_data (G_OBJECT (background), "default_drag_action",
+                       GINT_TO_POINTER (default_drag_action));
 
     /* Connect new signal handlers. */
     if (file != NULL)
     {
         g_signal_connect_object (background, "settings_changed",
-                                 G_CALLBACK (background_changed_callback), file, 0);
+                                 G_CALLBACK (caja_background_changed_cb), file, 0);
 
         g_signal_connect_object (background, "reset",
-                                 G_CALLBACK (background_reset_callback), file, 0);
+                                 G_CALLBACK (caja_background_reset_cb), file, 0);
 
         g_signal_connect_object (file, "changed",
-                                 G_CALLBACK (saved_settings_changed_callback), background, 0);
+                                 G_CALLBACK (caja_background_settings_notify_cb), background, 0);
 
-        g_object_weak_ref (G_OBJECT (background), background_weak_notify, file);
+        g_object_weak_ref (G_OBJECT (background), caja_background_weak_notify, file);
 
         /* arrange to receive file metadata */
-        caja_file_monitor_add (file,
-                               background,
-                               CAJA_FILE_ATTRIBUTE_INFO);
+        caja_file_monitor_add (file, background, CAJA_FILE_ATTRIBUTE_INFO);
 
         /* arrange for notification when the theme changes */
-        g_signal_connect (caja_preferences,
-                          "changed::" CAJA_PREFERENCES_BACKGROUND_SET,
-                          G_CALLBACK(caja_file_background_theme_changed),
-                          background);
-        g_signal_connect (caja_preferences,
-                          "changed::" CAJA_PREFERENCES_BACKGROUND_COLOR,
-                          G_CALLBACK(caja_file_background_theme_changed),
-                          background);
-        g_signal_connect (caja_preferences,
-                          "changed::" CAJA_PREFERENCES_BACKGROUND_URI,
-                          G_CALLBACK(caja_file_background_theme_changed),
-                          background);
+        g_signal_connect (caja_preferences, "changed::" CAJA_PREFERENCES_BACKGROUND_SET,
+                          G_CALLBACK(caja_background_theme_notify_cb), background);
+        g_signal_connect (caja_preferences, "changed::" CAJA_PREFERENCES_BACKGROUND_COLOR,
+                          G_CALLBACK(caja_background_theme_notify_cb), background);
+        g_signal_connect (caja_preferences, "changed::" CAJA_PREFERENCES_BACKGROUND_URI,
+                          G_CALLBACK(caja_background_theme_notify_cb), background);
     }
 
     /* Update the background based on the file metadata. */
-    initialize_background_from_settings (file, background);
+    caja_background_load_from_file_metadata (file, background);
+}
+
+/**
+ * DESKTOP BACKGROUND HANDLING
+ */
+
+/* handle the desktop background "settings_changed" signal */
+static void
+desktop_background_changed_cb (EelBackground *background,
+                               GdkDragAction  action,
+                               gpointer       user_data)
+{
+    eel_bg_save_to_gsettings (background,
+                              mate_background_preferences);
+}
+
+/* delayed initializor of desktop background after GSettings changes */
+static gboolean
+desktop_background_prefs_change_event_idle_cb (EelBackground *background)
+{
+    eel_bg_load_from_gsettings (background,
+                                mate_background_preferences);
+
+    eel_background_set_color (background,
+                              eel_bg_get_desktop_color (background));
+
+    g_object_unref (background);
+
+    return FALSE;       /* remove from the list of event sources */
+}
+
+/* handle the desktop background "reset" signal: reset to schema's defaults */
+static void
+desktop_background_reset_cb (EelBackground *background,
+                             gpointer       user_data)
+{
+    /* Reset to defaults, and save */
+    eel_bg_load_from_system_gsettings (background,
+                                       mate_background_preferences,
+                                       TRUE);
+    /* Reload from saved settings */
+    g_idle_add ((GSourceFunc) desktop_background_prefs_change_event_idle_cb,
+                g_object_ref (background));
+}
+
+/* handle the desktop GSettings "change-event" (batch changes) signal */
+static gboolean
+desktop_background_prefs_change_event_cb (GSettings *settings,
+                                          gpointer   keys,
+                                          gint       n_keys,
+                                          gpointer   user_data)
+{
+    EelBackground *background = user_data;
+
+    /* Defer signal processing to avoid making the dconf backend deadlock, and
+     * hold a ref to avoid accessing fields of an object that was destroyed.
+     */
+    g_idle_add ((GSourceFunc) desktop_background_prefs_change_event_idle_cb,
+                g_object_ref (background));
+
+    return FALSE;       /* let the event propagate further */
+}
+
+static void
+desktop_background_weak_notify (gpointer data,
+                                GObject *object)
+{
+    g_signal_handlers_disconnect_by_func (mate_background_preferences,
+                                          G_CALLBACK (desktop_background_prefs_change_event_cb),
+                                          object);
+}
+
+void
+caja_connect_desktop_background_to_settings (CajaIconContainer *icon_container)
+{
+    EelBackground *background;
+
+    background = eel_get_widget_background (GTK_WIDGET (icon_container));
+
+    eel_background_set_desktop (background,
+                                GTK_WIDGET (icon_container), TRUE);
+
+    g_signal_connect_object (background, "settings_changed",
+                             G_CALLBACK (desktop_background_changed_cb), NULL, 0);
+
+    g_signal_connect_object (background, "reset",
+                             G_CALLBACK (desktop_background_reset_cb), NULL, 0);
+
+    eel_bg_load_from_gsettings (background,
+                                mate_background_preferences);
+
+    /* Connect to "change-event" signal to receive *groups of changes* before
+     * they are split out into multiple emissions of the "changed" signal.
+     */
+    g_signal_connect (mate_background_preferences, "change-event",
+                      G_CALLBACK (desktop_background_prefs_change_event_cb),
+                      background);
+
+    g_object_weak_ref (G_OBJECT (background),
+                       desktop_background_weak_notify, NULL);
 }
diff --git a/libcaja-private/caja-directory-background.h b/libcaja-private/caja-directory-background.h
index 080655cf..c86e8136 100644
--- a/libcaja-private/caja-directory-background.h
+++ b/libcaja-private/caja-directory-background.h
@@ -5,6 +5,7 @@
                                     that is viewing a particular directory.
 
    Copyright (C) 2000 Eazel, Inc.
+   Copyright (C) 2012 Jasmine Hassan <[email protected]>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -21,16 +22,16 @@
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
    Boston, MA 02110-1301, USA.
 
-   Author: Darin Adler <[email protected]>
+   Authors: Darin Adler <[email protected]>
+            Jasmine Hassan <[email protected]>
 */
 
 #include <eel/eel-background.h>
 #include <libcaja-private/caja-file.h>
 #include <libcaja-private/caja-icon-container.h>
 
-void     caja_connect_background_to_file_metadata         (GtkWidget             *widget,
-        CajaFile          *file,
-        GdkDragAction          default_drag_action);
-void     caja_connect_desktop_background_to_file_metadata (CajaIconContainer *icon_container,
-        CajaFile          *file);
-gboolean caja_file_background_is_set                      (EelBackground         *background);
+void     caja_connect_background_to_file_metadata    (GtkWidget         *widget,
+                                                      CajaFile          *file,
+                                                      GdkDragAction      default_drag_action);
+
+void     caja_connect_desktop_background_to_settings (CajaIconContainer *icon_container);
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index 931df9f8..414aae37 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -1301,7 +1301,7 @@ fm_icon_view_begin_loading (FMDirectoryView *view)
      */
     if (FM_IS_DESKTOP_ICON_VIEW (view))
     {
-        caja_connect_desktop_background_to_file_metadata (CAJA_ICON_CONTAINER (icon_container), file);
+        caja_connect_desktop_background_to_settings (CAJA_ICON_CONTAINER (icon_container));
     }
     else
     {
@@ -1316,10 +1316,7 @@ fm_icon_view_begin_loading (FMDirectoryView *view)
             default_action = CAJA_DND_ACTION_SET_AS_FOLDER_BACKGROUND;
         }
 
-        caja_connect_background_to_file_metadata
-        (icon_container,
-         file,
-         default_action);
+        caja_connect_background_to_file_metadata (icon_container, file, default_action);
     }