From bed06d9ec3914ba39975a58797e79ff2ad028768 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 12 Dec 2012 13:11:13 -0500 Subject: Move the contact map widgets to addressbook/gui/widgets. Move the supporting widgets for the contact maps feature alongside EABContactDisplay. Removing them from libeutil helps isolate our usage of libchamplain so it's not imposed on the entire application, and even 3rd party software. That libchamplain is an optional dependency only further complicates the matter. Ideally I'd like to somehow isolate this feature in an extension module, but we currently lack sufficient hooks for such an extension. So this arrangement will have to suffice for now. --- modules/addressbook/Makefile.am | 5 +++-- modules/addressbook/e-book-shell-view-private.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'modules/addressbook') diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am index 63b1f4b965..759f195e05 100644 --- a/modules/addressbook/Makefile.am +++ b/modules/addressbook/Makefile.am @@ -18,9 +18,9 @@ module_addressbook_la_CPPFLAGS = \ -DPREFIX=\""$(prefix)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) \ - $(LDAP_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) + $(LDAP_CFLAGS) module_addressbook_la_SOURCES = \ evolution-module-addressbook.c \ @@ -67,6 +67,7 @@ module_addressbook_la_LIBADD = \ $(top_builddir)/addressbook/importers/libevolution-addressbook-importers.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) \ $(LDAP_LIBS) diff --git a/modules/addressbook/e-book-shell-view-private.h b/modules/addressbook/e-book-shell-view-private.h index 8aa12d157d..4be67e41f4 100644 --- a/modules/addressbook/e-book-shell-view-private.h +++ b/modules/addressbook/e-book-shell-view-private.h @@ -40,6 +40,7 @@ #include "addressbook/gui/widgets/eab-gui-util.h" #include "addressbook/gui/widgets/e-addressbook-view.h" #include "addressbook/gui/widgets/e-addressbook-selector.h" +#include "addressbook/gui/widgets/e-contact-map-window.h" #include "e-book-shell-backend.h" #include "e-book-shell-content.h" -- cgit v1.2.3