aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog7
-rw-r--r--addressbook/gui/widgets/eab-popup-control.c5
2 files changed, 7 insertions, 5 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 082e4320ff..aee73975f1 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-22 Chris Toshok <toshok@ximian.com>
+
+ [ should fix #60495, #58635 ]
+ * gui/widgets/eab-popup-control.c (name_only_query_cb): don't free
+ the list of contacts - libebook still owns it.
+ (query_cb): same.
+
2004-06-22 Larry Ewing <lewing@ximian.com>
* gui/contact-list-editor/e-contact-list-editor.c (add_email_cb):
diff --git a/addressbook/gui/widgets/eab-popup-control.c b/addressbook/gui/widgets/eab-popup-control.c
index cf2190ea5d..d1592d4627 100644
--- a/addressbook/gui/widgets/eab-popup-control.c
+++ b/addressbook/gui/widgets/eab-popup-control.c
@@ -1046,8 +1046,6 @@ name_only_query_cb (EBook *book, EBookStatus status, GList *contacts, gpointer c
eab_popup_control_no_matches (pop);
} else {
eab_popup_control_ambiguous_email_add (pop, contacts);
- g_list_foreach (contacts, (GFunc)g_object_unref, NULL);
- g_list_free (contacts);
}
}
@@ -1081,9 +1079,6 @@ query_cb (EBook *book, EBookStatus status, GList *contacts, gpointer closure)
eab_popup_control_display_contact (pop, E_CONTACT (contacts->data));
else
eab_popup_control_multiple_matches (pop, contacts);
-
- g_list_foreach (contacts, (GFunc)g_object_unref, NULL);
- g_list_free (contacts);
}
}