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/component | |
| 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/component')
| -rw-r--r-- | addressbook/gui/component/Makefile.am | 1 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook-component.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index e3f444d500..6f38d86436 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -54,6 +54,7 @@ evolution_addressbook_LDADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.a \ $(top_builddir)/addressbook/printing/libecontactprint.a \ $(top_builddir)/addressbook/gui/search/libeaddressbooksearch.a \ + $(top_builddir)/addressbook/gui/merging/libecardmerging.a \ $(top_builddir)/filter/libfilter.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/menus/libmenus.la diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index f27384dd36..6274eea50c 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -41,6 +41,7 @@ #include "addressbook-storage.h" #include "addressbook-component.h" #include "addressbook.h" +#include "addressbook/gui/merging/e-card-merging.h" @@ -299,7 +300,7 @@ dnd_drop_book_open_cb (EBook *book, EBookStatus status, GList *card_list) for (l = card_list; l; l = l->next) { ECard *card = l->data; - e_book_add_card (book, card, NULL /* XXX */, NULL); + e_card_merging_book_add_card (book, card, NULL /* XXX */, NULL); } } |