diff options
| author | Milan Crha <mcrha@redhat.com> | 2013-09-24 15:21:34 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2013-09-24 15:21:34 +0800 |
| commit | a3b2e00c235aecaaaad14881d0444e840089cf7e (patch) | |
| tree | e0b310e510873e7edc56f1424f7e41ba62cd6a30 /modules | |
| parent | 0055354699ac7e1306b6dac1f5e16710370519af (diff) | |
| download | gsoc2013-evolution-a3b2e00c235aecaaaad14881d0444e840089cf7e.tar gsoc2013-evolution-a3b2e00c235aecaaaad14881d0444e840089cf7e.tar.gz gsoc2013-evolution-a3b2e00c235aecaaaad14881d0444e840089cf7e.tar.bz2 gsoc2013-evolution-a3b2e00c235aecaaaad14881d0444e840089cf7e.tar.lz gsoc2013-evolution-a3b2e00c235aecaaaad14881d0444e840089cf7e.tar.xz gsoc2013-evolution-a3b2e00c235aecaaaad14881d0444e840089cf7e.tar.zst gsoc2013-evolution-a3b2e00c235aecaaaad14881d0444e840089cf7e.zip | |
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.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/addressbook/Makefile.am | 1 | ||||
| -rw-r--r-- | modules/vcard-inline/Makefile.am | 1 | ||||
| -rw-r--r-- | modules/vcard-inline/e-mail-part-vcard.c | 2 |
3 files changed, 1 insertions, 3 deletions
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 \ |