Add a huge steaming pile of code to handle the case of single-address

2001-06-25  Jon Trowbridge  <trow@ximian.com>

        * gui/component/e-address-popup.c: Add a huge steaming pile of
        code to handle the case of single-address merging.  In other
        words, if you go to "harvest" an address by right-clicking on it
        in the mail viewer, and you already have a closely-matching
        contact (w/ a different e-mail address), this gives you the
        option of editting that contact's e-mail addresses to add the
        one you just clicked on.

        * backend/ebook/e-card-compare.c (match_search_info_free): It is
        amazing how much better things work when you don't try to
        dereference the pointer you just freed.

svn path=/trunk/; revision=10469

1 files changed, 7 insertions, 4 deletions

diff --git a/addressbook/backend/ebook/e-card-compare.c b/addressbook/backend/ebook/e-card-compare.c
index 6f5cf86de9..92f1cc9099 100644
--- a/addressbook/backend/ebook/e-card-compare.c
+++ b/addressbook/backend/ebook/e-card-compare.c
@@ -336,11 +336,14 @@ match_search_info_free (MatchSearchInfo *info)
 {
 	if (info) {
 		gtk_object_unref (GTK_OBJECT (info->card));
-		g_free (info);
-		
+
 		/* This should already have been deallocated, but just in case... */
-		g_list_foreach (info->avoid, (GFunc) gtk_object_unref, NULL);
-		g_list_free (info->avoid);
+		if (info->avoid) {
+			g_list_foreach (info->avoid, (GFunc) gtk_object_unref, NULL);
+			g_list_free (info->avoid);
+		}
+
+		g_free (info);
 	}
 }