[gnome-control-center] background: Copy to set the new background

[Bastien Nocera <hadess src gnome org>]

commit 6b4f95e9d1988dae68b9dfa0ddf8b40f8fedd1aa
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Feb 11 12:48:48 2011 +0000

    background: Copy to set the new background
    
    Instead of reusing the item from the list store, otherwise we
    might be tweaking properties for an item that we shouldn't,
    and leaking user preferences into the "static" list store.

 panels/background/cc-background-panel.c |   35 +-----------------------------
 1 files changed, 2 insertions(+), 33 deletions(-)
---
diff --git a/panels/background/cc-background-panel.c b/panels/background/cc-background-panel.c
index 47a5532..e605277 100644
--- a/panels/background/cc-background-panel.c
+++ b/panels/background/cc-background-panel.c
@@ -358,40 +358,9 @@ update_preview (CcBackgroundPanelPrivate *priv,
 
   if (item && priv->current_background)
     {
-      //FIXME is that correct?
       g_object_unref (priv->current_background);
-      priv->current_background = g_object_ref (item);
-#if 0
-      g_object_set (G_OBJECT (priv->current_background),
-      		    "primary-color", cc_background_item_get_pcolor (item),
-      		    "secondary-color", cc_background_item_get_scolor (item),
-      		    "filename", cc_background_item_get_filename (item),
-      		    "placement", cc_background_item_get_placement (item),
-      		    "shading", cc_background_item_get_shading (item),
-
-      if (priv->current_background->pcolor)
-        gdk_color_free (priv->current_background->pcolor);
-      priv->current_background->pcolor = gdk_color_copy (item->pcolor);
-
-      if (priv->current_background->scolor)
-        gdk_color_free (priv->current_background->scolor);
-      priv->current_background->scolor = gdk_color_copy (item->scolor);
-
-      g_free (priv->current_background->filename);
-      priv->current_background->filename = g_strdup (item->filename);
-
-      g_free (priv->current_background->name);
-      priv->current_background->name = g_strdup (item->name);
-
-      priv->current_background->options = item->options;
-      priv->current_background->shade_type = item->shade_type;
-
-      priv->current_background->height = item->height;
-      priv->current_background->width = item->width;
-
-      cc_background_item_ensure_gnome_bg (priv->current_background);
-      cc_background_item_update_size (priv->current_background, priv->thumb_factory);
-#endif
+      priv->current_background = cc_background_item_copy (item);
+      cc_background_item_load (priv->current_background, NULL);
     }
 
   source_update_edit_box (priv, FALSE);