Index: gnome-settings-daemon/ChangeLog

===================================================================
--- gnome-settings-daemon/ChangeLog     (revision 8392)
+++ gnome-settings-daemon/ChangeLog     (working copy)
@@ -1,3 +1,9 @@
+2008-01-14  Soren Sandmann  <sandmann@daimi.au.dk>
+
+       * gnome-settings-background.c: Use GnomeBG from gnome-desktop
+
+
+
 2008-01-14  Denis Washington  <denisw@svn.gnome.org>
 
        * gnome-settings-mouse.c:

===================================================================
--- libbackground/ChangeLog     (revision 8336)
+++ libbackground/ChangeLog     (working copy)
@@ -1,3 +1,9 @@
+2008-01-14  Soren Sandmann <sandmann@daimi.au.dk>
+
+       * applier.[ch]: Delete these files
+
+       * Makefile.am: Remove them here.
+
 2007-04-16  Jens Granseuer  <jensgr@gmx.net>
 
        Patch by: Erich Schubert <erich@debian.org>


Index: capplets/appearance/ChangeLog
===================================================================
--- capplets/appearance/ChangeLog       (revision 8392)
+++ capplets/appearance/ChangeLog       (working copy)
@@ -1,3 +1,13 @@
+2008-01-14  Soren Sandmann  <sandmann@redhat.com>
+
+       * appearance-desktop.c: Update list model when the background
+       changes. 
+       * gnome-wp-item.c: Create a GnomeBG for the item.
+       * gnome-wp-item.h: Add a GnomeBG field - Remove
+       gnome_wp_item_dup() function.
+       * gnome-wp-info.c: Delete gnome_wp_item_dup() function.
+       * gnome-wp-xml.c: Ensure that a GnomeBG exists.
+
 2007-12-22  Thomas Wood  <thos@gnome.org>
 
        * theme-installer.c: (transfer_done_tgz_tbz),


svn path=/trunk/; revision=8393

capplets/appearance/gnome-wp-xml.c

@@ -231,7 +231,11 @@ static void gnome_wp_xml_load_xml (AppearanceData *data,
 	g_hash_table_insert (data->wp_hash, wp->filename, wp);
       } else {
 	gnome_wp_item_free (wp);
+        wp = NULL;
       }
+
+      if (wp)
+        gnome_wp_item_ensure_gnome_bg (wp);
     }
   }
   xmlFreeDoc (wplist);