6 files changed, 14 insertions, 10 deletions
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index 92b925d199..a375965a66 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -5,10 +5,7 @@ INCLUDES =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/addressbook/backend/ebook	\
 	-I$(top_srcdir)/addressbook/contact-editor	\
-	-I$(top_srcdir)/widgets/e-text			\
-	-I$(top_srcdir)/widgets/e-table			\
-	-I$(top_srcdir)/widgets/e-reflow		\
-	-I$(top_srcdir)/widgets/e-table			\
+	-I$(top_srcdir)/addressbook/gui/merging		\
 	-I$(top_srcdir)/widgets/misc			\
 	$(BONOBO_GNOME_CFLAGS)				\
 	$(EXTRA_GNOME_CFLAGS)
@@ -71,11 +68,13 @@ minicard_test_LDADD =							\
 	$(top_builddir)/e-util/ename/libename.la			\
 	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
 	$(top_builddir)/addressbook/printing/libecontactprint.a		\
+	$(top_builddir)/addressbook/gui/merging/libecardmerging.a	\
 	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
 	$(top_builddir)/e-util/libeutil.la				\
 	$(EXTRA_GNOME_LIBS)						\
 	$(BONOBO_GNOME_LIBS)						\
-	$(GNOME_PRINT_LIBS)
+	$(GNOME_PRINT_LIBS)						\
+	libeminicard.a
 
 #reflow_test_SOURCES = 	\
 #	 test-reflow.c
@@ -123,6 +122,7 @@ minicard_widget_test_LDADD =						\
 	$(top_builddir)/addressbook/printing/libecontactprint.a		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
 	$(top_builddir)/e-util/libeutil.la				\
+	$(top_builddir)/addressbook/gui/merging/libecardmerging.a	\
 	$(EXTRA_GNOME_LIBS)						\
 	$(BONOBO_GNOME_LIBS)						\
 	$(GNOME_PRINT_LIBS)
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c
index 5ddc8acdfb..9557046afe 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c
@@ -3,6 +3,7 @@
 #include <config.h>
 #include "e-addressbook-model.h"
 #include "e-addressbook-table-adapter.h"
+#include "e-card-merging.h"
 #include "e-addressbook-util.h"
 #include <gnome-xml/tree.h>
 #include <gnome-xml/parser.h>
@@ -169,7 +170,7 @@ addressbook_append_row (ETableModel *etm, ETableModel *source, gint row)
 		e_card_simple_set(simple, col, val);
 	}
 	e_card_simple_sync_card(simple);
-	e_book_add_card (e_addressbook_model_get_ebook (priv->model), card, NULL, NULL);
+	e_card_merging_book_add_card (e_addressbook_model_get_ebook (priv->model), card, NULL, NULL);
 	gtk_object_unref(GTK_OBJECT(simple));
 	gtk_object_unref(GTK_OBJECT(card));
 }
diff --git a/addressbook/gui/widgets/e-addressbook-util.c b/addressbook/gui/widgets/e-addressbook-util.c
index 55d3ce503e..6db628c412 100644
--- a/addressbook/gui/widgets/e-addressbook-util.c
+++ b/addressbook/gui/widgets/e-addressbook-util.c
@@ -26,6 +26,7 @@
 
 #include "e-addressbook-util.h"
 #include "e-contact-editor.h"
+#include "e-card-merging.h"
 
 void
 e_addressbook_error_dialog (const gchar *msg, EBookStatus status)
@@ -84,7 +85,7 @@ add_card_cb (EContactEditor *ce, ECard *card, gpointer data)
 	EBook *book;
 
 	book = E_BOOK (data);
-	e_book_add_card (book, card, card_added_cb, NULL);
+	e_card_merging_book_add_card (book, card, card_added_cb, NULL);
 }
 
 /* Callback for the commit_card signal from the contact editor */
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 99dc600e94..99672f2ede 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -53,6 +53,7 @@
 #include "e-addressbook-reflow-adapter.h"
 #include "e-minicard-view-widget.h"
 #include "e-contact-save-as.h"
+#include "e-card-merging.h"
 
 #include "e-contact-editor.h"
 
@@ -1168,7 +1169,7 @@ selection_received (GtkWidget *invisible,
 		for (l = card_list; l; l = l->next) {
 			ECard *card = l->data;
 
-			e_book_add_card (view->book, card, NULL /* XXX */, NULL);
+			e_card_merging_book_add_card (view->book, card, NULL /* XXX */, NULL);
 		}
 
 		g_list_foreach (card_list, (GFunc)gtk_object_unref, NULL);
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));
 }
 
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index 66b25401a5..a85656a743 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -24,7 +24,7 @@
 
 #include "e-minicard-view.h"
 
-#include "e-contact-editor.h"
+#include "e-addressbook-util.h"
 
 #include <gtk/gtkselection.h>
 #include <gtk/gtkdnd.h>