From 64977cb1bcc55bf4c7c0fc38cd3d047b1e6a25c6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 19 Apr 2007 18:53:33 +0000 Subject: Massive code cleanup (bug #429422) svn path=/trunk/; revision=33432 --- addressbook/gui/widgets/eab-vcard-control.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'addressbook/gui/widgets/eab-vcard-control.c') diff --git a/addressbook/gui/widgets/eab-vcard-control.c b/addressbook/gui/widgets/eab-vcard-control.c index b015f865f5..df45562fb8 100644 --- a/addressbook/gui/widgets/eab-vcard-control.c +++ b/addressbook/gui/widgets/eab-vcard-control.c @@ -125,7 +125,11 @@ pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream, return; } - e_free_object_list (vcard_control->card_list); + g_list_foreach ( + vcard_control->card_list, + (GFunc) g_object_unref, NULL); + g_list_free (vcard_control->card_list); + list = eab_contact_list_from_string (vcard); g_free(vcard); vcard_control->card_list = list; @@ -192,7 +196,8 @@ book_open_cb (EBook *book, EBookStatus status, gpointer closure) } if (book) g_object_unref (book); - e_free_object_list (list); + g_list_foreach (list, (GFunc) g_object_unref, NULL); + g_list_free (list); } static void @@ -236,7 +241,11 @@ static void free_struct (gpointer data, GObject *where_object_was) { EABVCardControl *vcard_control = data; - e_free_object_list (vcard_control->card_list); + + g_list_foreach ( + vcard_control->card_list, + (GFunc) g_object_unref, NULL); + g_list_free (vcard_control->card_list); g_free (vcard_control); } -- cgit v1.2.3