From 5c58686c8ef72be5ed8a2d4469b3556f80d4b81c Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Sat, 9 Jun 2001 06:31:55 +0000 Subject: Null terminate the strv here. (e_card_locate_match): ref here instead of 2001-06-09 Christopher James Lahey * backend/ebook/e-card-compare.c (use_common_book_cb): Null terminate the strv here. (e_card_locate_match): ref here instead of unref. * backend/ebook/e-card-simple.c (e_card_simple_get): Handle a NULL card here. * contact-editor/Makefile.am (INCLUDES), gui/widgets/Makefile.am (INCLUDES): Added addressbook/gui/merging here. * contact-editor/e-contact-quick-add.c (book_ready_cb), gui/component/addressbook-component.c (dnd_drop_book_open_cb), gui/widgets/e-addressbook-table-adapter.c (addressbook_append_row), gui/widgets/e-addressbook-util.c (add_card_cb), gui/widgets/e-addressbook-view.c (selection_received), gui/widgets/e-minicard-control.c (book_open_cb): Use e_card_merging_book_add_card instead of e_book_add_card here. * gui/Makefile.am (SUBDIRS): Added merging. * gui/component/Makefile.am (evolution_addressbook_LDADD), gui/widgets/Makefile.am (minicard_test_LDADD, minicard_widget_test_LDADD): Added libecardmerging.a here. * gui/merging/, gui/merging/.cvsignore, gui/merging/Makefile.am: New addressbook library. * gui/merging/e-card-duplicate-detected.glade: Glade file for duplicate detected dialog. * gui/merging/e-card-merging.c, gui/merging/e-card-merging.h: New files for detecting duplicates before adding and putting up a dialog if duplicates are found. * gui/widgets/e-minicard-view.c: Include e-addressbook-util.h here. svn path=/trunk/; revision=10170 --- addressbook/gui/widgets/e-minicard-control.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'addressbook/gui/widgets/e-minicard-control.c') diff --git a/addressbook/gui/widgets/e-minicard-control.c b/addressbook/gui/widgets/e-minicard-control.c index ab1356d1d5..7802dd0b20 100644 --- a/addressbook/gui/widgets/e-minicard-control.c +++ b/addressbook/gui/widgets/e-minicard-control.c @@ -19,6 +19,7 @@ #include "e-minicard-control.h" #include "e-minicard-widget.h" +#include "e-card-merging.h" #if 0 enum { @@ -225,7 +226,7 @@ static void book_open_cb (EBook *book, EBookStatus status, gpointer closure) { ECard *card = closure; - e_book_add_card(book, card, NULL, NULL); + e_card_merging_book_add_card(book, card, NULL, NULL); gtk_object_unref(GTK_OBJECT(card)); } -- cgit v1.2.3