summaryrefslogtreecommitdiff
path: root/capplets
diff options
context:
space:
mode:
authorRodney Dawes <dobey@ximian.com>2004-01-13 20:17:51 +0000
committerRodney Dawes <dobey@src.gnome.org>2004-01-13 20:17:51 +0000
commit144005a19bad795bfa95bf69cf8376dc33fce1df (patch)
tree56b54dc59caafbad66e3934eea7a4733c6b36e3b /capplets
parentde98760fb2d4a6cd93daf05b89e3e8f19c9bc70e (diff)
downloadgnome-control-center-144005a19bad795bfa95bf69cf8376dc33fce1df.tar.gz
Fix previous change to use gnome_wp_item_free () instead of g_free (), and
2004-01-12 Rodney Dawes <dobey@ximian.com> * gnome-wp-xml.c (gnome_wp_load_legacy): Fix previous change to use gnome_wp_item_free () instead of g_free (), and fix tab width
Diffstat (limited to 'capplets')
-rw-r--r--capplets/background/ChangeLog5
-rw-r--r--capplets/background/gnome-wp-xml.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog
index ab5898630..402861b21 100644
--- a/capplets/background/ChangeLog
+++ b/capplets/background/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-12 Rodney Dawes <dobey@ximian.com>
+
+ * gnome-wp-xml.c (gnome_wp_load_legacy): Fix previous change to
+ use gnome_wp_item_free () instead of g_free (), and fix tab width
+
2004-01-12 Diego Gonzalez <diego@pemas.net>
* gnome-wp-xml.c (gnome_wp_load_legacy): don't crash if we could
diff --git a/capplets/background/gnome-wp-xml.c b/capplets/background/gnome-wp-xml.c
index 44b0fc5e1..17ac5d0c4 100644
--- a/capplets/background/gnome-wp-xml.c
+++ b/capplets/background/gnome-wp-xml.c
@@ -81,9 +81,10 @@ static void gnome_wp_load_legacy (GnomeWPCapplet * capplet) {
item->filename = g_strdup (foo);
item->fileinfo = gnome_wp_info_new (item->filename, capplet->thumbs);
+
if (item->fileinfo == NULL) {
- g_free (item);
- continue;
+ gnome_wp_item_free (item);
+ continue;
}
item->shade_type = gconf_client_get_string (capplet->client,