diff options
| author | Christopher James Lahey <clahey@ximian.com> | 2001-06-09 14:31:55 +0800 |
|---|---|---|
| committer | Chris Lahey <clahey@src.gnome.org> | 2001-06-09 14:31:55 +0800 |
| commit | 5c58686c8ef72be5ed8a2d4469b3556f80d4b81c (patch) | |
| tree | 0f708cfe4db04dad2e15a4bb44aa58772aaf3b21 /addressbook/gui/contact-editor/e-contact-quick-add.c | |
| parent | 7343d66ba7149b389b86508d188bab9c4bfe28dc (diff) | |
| download | gsoc2013-evolution-5c58686c8ef72be5ed8a2d4469b3556f80d4b81c.tar gsoc2013-evolution-5c58686c8ef72be5ed8a2d4469b3556f80d4b81c.tar.gz gsoc2013-evolution-5c58686c8ef72be5ed8a2d4469b3556f80d4b81c.tar.bz2 gsoc2013-evolution-5c58686c8ef72be5ed8a2d4469b3556f80d4b81c.tar.lz gsoc2013-evolution-5c58686c8ef72be5ed8a2d4469b3556f80d4b81c.tar.xz gsoc2013-evolution-5c58686c8ef72be5ed8a2d4469b3556f80d4b81c.tar.zst gsoc2013-evolution-5c58686c8ef72be5ed8a2d4469b3556f80d4b81c.zip | |
Null terminate the strv here. (e_card_locate_match): ref here instead of
2001-06-09 Christopher James Lahey <clahey@ximian.com>
* 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
Diffstat (limited to 'addressbook/gui/contact-editor/e-contact-quick-add.c')
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-quick-add.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c index f9556f6758..edc8bae5cc 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.c +++ b/addressbook/gui/contact-editor/e-contact-quick-add.c @@ -42,6 +42,7 @@ #include <addressbook/backend/ebook/e-card.h> #include "e-contact-editor.h" #include "e-contact-quick-add.h" +#include "e-card-merging.h" static void e_card_quick_set_name (ECard *card, const gchar *str) @@ -85,7 +86,7 @@ book_ready_cb (EBook *book, EBookStatus status, gpointer user_data) gpointer cb_user_data = gtk_object_get_data (GTK_OBJECT (card), "e-contact-quick-add-user-data"); if (status == E_BOOK_STATUS_SUCCESS) { - e_book_add_card (book, card, NULL, NULL); + e_card_merging_book_add_card (book, card, NULL, NULL); if (cb) cb (card, cb_user_data); } else { |