Bug #659890 - Merge addressbook 'widgets' and 'merging' libraries

These two cross-referenced each other, which could cause runtime issues,
thus rather merge them into one.

16 files changed, 22 insertions, 42 deletions

diff --git a/addressbook/gui/Makefile.am b/addressbook/gui/Makefile.am
index 7f08bf425d..fb552f216d 100644
--- a/addressbook/gui/Makefile.am
+++ b/addressbook/gui/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = merging widgets contact-editor contact-list-editor
+SUBDIRS = widgets contact-editor contact-list-editor
 
 -include $(top_srcdir)/git.mk
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index 5307298a0f..4e5d0b7111 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -4,7 +4,7 @@ libecontacteditor_la_CPPFLAGS =				\
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/addressbook/			\
-	-I$(top_srcdir)/addressbook/gui/merging		\
+	-I$(top_srcdir)/addressbook/gui/widgets		\
 	-I$(top_builddir)/shell				\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"		\
 	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
@@ -29,7 +29,6 @@ libecontacteditor_la_LIBADD =						\
 	$(top_builddir)/e-util/libevolution-util.la			\
 	$(top_builddir)/addressbook/util/libeabutil.la			\
 	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la	\
-	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la	\
 	$(top_builddir)/addressbook/printing/libecontactprint.la	\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)					\
 	$(EVOLUTION_DATA_SERVER_LIBS)					\
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index 6f38f09160..01a04bce82 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -4,7 +4,7 @@ libecontactlisteditor_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/addressbook/			\
-	-I$(top_srcdir)/addressbook/gui/merging		\
+	-I$(top_srcdir)/addressbook/gui/widgets		\
 	-I$(top_srcdir)/addressbook/gui/contact-editor	\
 	-I$(top_builddir)/shell				\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"		\
diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am
deleted file mode 100644
index 319c1221fc..0000000000
--- a/addressbook/gui/merging/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-noinst_LTLIBRARIES = libeabbookmerging.la
-
-libeabbookmerging_la_CPPFLAGS =				\
-	$(AM_CPPFLAGS)					\
-	-DG_LOG_DOMAIN=\"eab-contact-merging\"		\
-	-DEVOLUTION_UIDIR=\""$(uidir)"\"		\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook			\
-	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
-	$(GNOME_PLATFORM_CFLAGS)			\
-	$(GTKHTML_CFLAGS)
-
-libeabbookmerging_la_SOURCES =			\
-	eab-contact-compare.c			\
-	eab-contact-compare.h			\
-	eab-contact-merging.c			\
-	eab-contact-merging.h
-
-ui_DATA = \
-	eab-contact-duplicate-detected.ui	\
-	eab-contact-commit-duplicate-detected.ui
-
-EXTRA_DIST = $(ui_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index f9fea781a8..1c7e8f090e 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -11,9 +11,9 @@ libeabwidgets_la_CPPFLAGS =				\
 	-DEVOLUTION_RULEDIR=\"$(ruledir)\"		\
 	-DEVOLUTION_IMAGESDIR=\"${imagesdir}\"		\
 	-DEVOLUTION_PRIVDATADIR=\"${privdatadir}\"	\
+	-DEVOLUTION_UIDIR=\""$(uidir)"\"		\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/addressbook			\
-	-I$(top_srcdir)/addressbook/gui/merging		\
 	-I$(top_srcdir)/addressbook/util		\
 	-I$(top_builddir)/shell				\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
@@ -29,10 +29,14 @@ eabinclude_HEADERS = 			\
 
 libeabwidgets_la_SOURCES =			\
 	eab-config.c				\
+	eab-contact-compare.c			\
+	eab-contact-compare.h			\
 	eab-contact-display.c			\
 	eab-contact-display.h			\
 	eab-contact-formatter.c			\
 	eab-contact-formatter.h			\
+	eab-contact-merging.c			\
+	eab-contact-merging.h			\
 	eab-gui-util.c				\
 	eab-gui-util.h				\
 	e-contact-map.c				\
@@ -61,12 +65,12 @@ libeabwidgets_la_SOURCES =			\
 	e-addressbook-view.h			\
 	gal-view-minicard.c			\
 	gal-view-minicard.h			\
-	ea-minicard.c			\
-	ea-minicard.h			\
+	ea-minicard.c				\
+	ea-minicard.h				\
 	ea-minicard-view.c			\
 	ea-minicard-view.h			\
-	ea-addressbook-view.c		\
-	ea-addressbook-view.h		\
+	ea-addressbook-view.c			\
+	ea-addressbook-view.h			\
 	ea-addressbook.c			\
 	ea-addressbook.h
 
@@ -85,8 +89,13 @@ dist-hook:
 
 etspec_DATA= e-addressbook-view.etspec
 
+ui_DATA = \
+	eab-contact-duplicate-detected.ui	\
+	eab-contact-commit-duplicate-detected.ui
+
 EXTRA_DIST = 			\
 	$(etspec_DATA)		\
-	$(rule_DATA)
+	$(rule_DATA)		\
+	$(ui_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui b/addressbook/gui/widgets/eab-contact-commit-duplicate-detected.ui
index 04ed728a56..04ed728a56 100644
--- a/addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui
+++ b/addressbook/gui/widgets/eab-contact-commit-duplicate-detected.ui
diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/widgets/eab-contact-compare.c
index bfca37cbff..bfca37cbff 100644
--- a/addressbook/gui/merging/eab-contact-compare.c
+++ b/addressbook/gui/widgets/eab-contact-compare.c
diff --git a/addressbook/gui/merging/eab-contact-compare.h b/addressbook/gui/widgets/eab-contact-compare.h
index f6b05705cf..f6b05705cf 100644
--- a/addressbook/gui/merging/eab-contact-compare.h
+++ b/addressbook/gui/widgets/eab-contact-compare.h
diff --git a/addressbook/gui/merging/eab-contact-duplicate-detected.ui b/addressbook/gui/widgets/eab-contact-duplicate-detected.ui
index 124b9c2787..124b9c2787 100644
--- a/addressbook/gui/merging/eab-contact-duplicate-detected.ui
+++ b/addressbook/gui/widgets/eab-contact-duplicate-detected.ui
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/widgets/eab-contact-merging.c
index 56fef2bc40..56fef2bc40 100644
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ b/addressbook/gui/widgets/eab-contact-merging.c
diff --git a/addressbook/gui/merging/eab-contact-merging.h b/addressbook/gui/widgets/eab-contact-merging.h
index fbdc9b0889..fbdc9b0889 100644
--- a/addressbook/gui/merging/eab-contact-merging.h
+++ b/addressbook/gui/widgets/eab-contact-merging.h
diff --git a/configure.ac b/configure.ac
index 651bbd5519..4509a64660 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1425,7 +1425,6 @@ addressbook/Makefile
 addressbook/gui/Makefile
 addressbook/gui/contact-editor/Makefile
 addressbook/gui/contact-list-editor/Makefile
-addressbook/gui/merging/Makefile
 addressbook/gui/widgets/Makefile
 addressbook/importers/Makefile
 addressbook/printing/Makefile
diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am
index 8faf8a3967..f30a75204c 100644
--- a/modules/addressbook/Makefile.am
+++ b/modules/addressbook/Makefile.am
@@ -55,7 +55,6 @@ module_addressbook_la_LIBADD = \
 	$(top_builddir)/composer/libevolution-mail-composer.la	\
 	$(top_builddir)/addressbook/printing/libecontactprint.la \
 	$(top_builddir)/shell/libevolution-shell.la		\
-	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \
 	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \
 	$(top_builddir)/addressbook/util/libeabutil.la		\
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
diff --git a/modules/vcard-inline/Makefile.am b/modules/vcard-inline/Makefile.am
index 84a21eb96a..cc7627d510 100644
--- a/modules/vcard-inline/Makefile.am
+++ b/modules/vcard-inline/Makefile.am
@@ -23,7 +23,6 @@ module_vcard_inline_la_LIBADD =				\
 	$(top_builddir)/em-format/libevolution-mail-formatter.la	\
 	$(top_builddir)/addressbook/util/libeabutil.la			\
 	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la	\
-	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la	\
 	$(top_builddir)/addressbook/printing/libecontactprint.la	\
 	$(EVOLUTION_DATA_SERVER_LIBS)					\
 	$(GNOME_PLATFORM_LIBS)						\
diff --git a/modules/vcard-inline/e-mail-part-vcard.c b/modules/vcard-inline/e-mail-part-vcard.c
index 5986154d55..3f52ec636d 100644
--- a/modules/vcard-inline/e-mail-part-vcard.c
+++ b/modules/vcard-inline/e-mail-part-vcard.c
@@ -25,7 +25,7 @@
 #include <em-format/e-mail-part-utils.h>
 
 #include <shell/e-shell.h>
-#include <addressbook/gui/merging/eab-contact-merging.h>
+#include <addressbook/gui/widgets/eab-contact-merging.h>
 
 #define E_MAIL_PART_VCARD_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9f18248d31..785fd59d18 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -9,9 +9,9 @@ addressbook/gui/contact-editor/e-contact-quick-add.c
 [type: gettext/glade]addressbook/gui/contact-editor/fullname.ui
 [type: gettext/glade]addressbook/gui/contact-list-editor/contact-list-editor.ui
 addressbook/gui/contact-list-editor/e-contact-list-editor.c
-[type: gettext/glade]addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui
-[type: gettext/glade]addressbook/gui/merging/eab-contact-duplicate-detected.ui
-addressbook/gui/merging/eab-contact-merging.c
+[type: gettext/glade]addressbook/gui/widgets/eab-contact-commit-duplicate-detected.ui
+[type: gettext/glade]addressbook/gui/widgets/eab-contact-duplicate-detected.ui
+addressbook/gui/widgets/eab-contact-merging.c
 addressbook/gui/widgets/addresstypes.xml
 addressbook/gui/widgets/e-addressbook-model.c
 addressbook/gui/widgets/e-addressbook-reflow-adapter.c