From a3b2e00c235aecaaaad14881d0444e840089cf7e Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Tue, 24 Sep 2013 09:21:34 +0200
Subject: 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.
---
 modules/vcard-inline/Makefile.am         | 1 -
 modules/vcard-inline/e-mail-part-vcard.c | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'modules/vcard-inline')

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 \
-- 
cgit v1.2.3