From 3c30fb17476059e2a30df110bf9842b2fecee634 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Mon, 11 Nov 2013 10:45:43 -0500
Subject: Convert libemail-engine to a single-include model.

Use: #include <libemail-engine/libemail-engine.h>
---
 modules/bogofilter/Makefile.am                | 6 ++++--
 modules/bogofilter/evolution-bogofilter.c     | 2 +-
 modules/itip-formatter/itip-view.c            | 4 ----
 modules/mail/e-mail-shell-backend.c           | 5 -----
 modules/mail/e-mail-shell-content.c           | 2 --
 modules/mail/e-mail-shell-view-private.h      | 8 --------
 modules/mail/em-composer-prefs.c              | 2 --
 modules/mdn/evolution-mdn.c                   | 2 --
 modules/spamassassin/evolution-spamassassin.c | 2 +-
 9 files changed, 6 insertions(+), 27 deletions(-)

(limited to 'modules')

diff --git a/modules/bogofilter/Makefile.am b/modules/bogofilter/Makefile.am
index 778a5f7d92..5ea0e06fb8 100644
--- a/modules/bogofilter/Makefile.am
+++ b/modules/bogofilter/Makefile.am
@@ -6,7 +6,8 @@ module_bogofilter_la_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"evolution-bogofilter\"			\
 	-DWELCOME_MESSAGE=\""$(privdatadir)/default/C/mail/local/Inbox"\" \
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
-	$(GNOME_PLATFORM_CFLAGS)
+	$(GNOME_PLATFORM_CFLAGS)				\
+	$(GTKHTML_CFLAGS)
 
 module_bogofilter_la_SOURCES = \
 	evolution-bogofilter.c
@@ -16,7 +17,8 @@ module_bogofilter_la_LIBADD = \
 	$(top_builddir)/mail/libevolution-mail.la		\
 	$(top_builddir)/libemail-engine/libemail-engine.la	\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)
+	$(GNOME_PLATFORM_LIBS)					\
+	$(GTKHTML_LIBS)
 
 module_bogofilter_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/bogofilter/evolution-bogofilter.c b/modules/bogofilter/evolution-bogofilter.c
index 01374eaa0d..30bcef3fa9 100644
--- a/modules/bogofilter/evolution-bogofilter.c
+++ b/modules/bogofilter/evolution-bogofilter.c
@@ -27,7 +27,7 @@
 
 #include <camel/camel.h>
 
-#include <libemail-engine/e-mail-junk-filter.h>
+#include <libemail-engine/libemail-engine.h>
 
 /* Standard GObject macros */
 #define E_TYPE_BOGOFILTER \
diff --git a/modules/itip-formatter/itip-view.c b/modules/itip-formatter/itip-view.c
index 769b45ac2c..1c193a4844 100644
--- a/modules/itip-formatter/itip-view.c
+++ b/modules/itip-formatter/itip-view.c
@@ -34,10 +34,6 @@
 
 #include <calendar/gui/itip-utils.h>
 
-#include <libemail-engine/mail-folder-cache.h>
-#include <libemail-engine/mail-mt.h>
-#include <libemail-engine/mail-tools.h>
-
 #include <mail/em-config.h>
 #include <mail/em-utils.h>
 #include <em-format/e-mail-formatter-utils.h>
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index e71f1497d4..fe220742ed 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -32,11 +32,6 @@
 
 #include <composer/e-msg-composer.h>
 
-#include <libemail-engine/e-mail-folder-utils.h>
-#include <libemail-engine/e-mail-session.h>
-#include <libemail-engine/mail-config.h>
-#include <libemail-engine/mail-ops.h>
-
 #include <mail/e-mail-browser.h>
 #include <mail/e-mail-config-assistant.h>
 #include <mail/e-mail-config-window.h>
diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c
index 84a7d5fb03..46153f1fb2 100644
--- a/modules/mail/e-mail-shell-content.c
+++ b/modules/mail/e-mail-shell-content.c
@@ -29,8 +29,6 @@
 
 #include <e-util/e-util-private.h>
 
-#include <libemail-engine/mail-ops.h>
-
 #include <mail/e-mail-paned-view.h>
 #include <mail/e-mail-reader.h>
 #include <mail/e-mail-reader-utils.h>
diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h
index 9986feb17f..47694aedc2 100644
--- a/modules/mail/e-mail-shell-view-private.h
+++ b/modules/mail/e-mail-shell-view-private.h
@@ -28,14 +28,6 @@
 #include <gtkhtml/gtkhtml.h>
 #include <camel/camel-search-private.h>  /* for camel_search_word */
 
-#include <libemail-engine/e-mail-folder-utils.h>
-#include <libemail-engine/e-mail-session.h>
-#include <libemail-engine/e-mail-session-utils.h>
-#include <libemail-engine/e-mail-store-utils.h>
-#include <libemail-engine/mail-folder-cache.h>
-#include <libemail-engine/mail-ops.h>
-#include <libemail-engine/mail-tools.h>
-
 #include <mail/e-mail-label-action.h>
 #include <mail/e-mail-label-dialog.h>
 #include <mail/e-mail-label-list-store.h>
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index bd2d0390ec..2ce523065a 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -43,8 +43,6 @@
 
 #include <shell/e-shell-utils.h>
 
-#include <libemail-engine/e-mail-folder-utils.h>
-
 #include <mail/em-config.h>
 #include <mail/em-folder-selection-button.h>
 #include <mail/em-folder-selector.h>
diff --git a/modules/mdn/evolution-mdn.c b/modules/mdn/evolution-mdn.c
index 225406438b..f4fcfc4906 100644
--- a/modules/mdn/evolution-mdn.c
+++ b/modules/mdn/evolution-mdn.c
@@ -22,8 +22,6 @@
 
 #include <libebackend/libebackend.h>
 
-#include <libemail-engine/e-mail-session-utils.h>
-
 #include <mail/em-utils.h>
 #include <mail/e-mail-reader.h>
 #include <mail/mail-send-recv.h>
diff --git a/modules/spamassassin/evolution-spamassassin.c b/modules/spamassassin/evolution-spamassassin.c
index 30793ca8a7..85b4b85735 100644
--- a/modules/spamassassin/evolution-spamassassin.c
+++ b/modules/spamassassin/evolution-spamassassin.c
@@ -26,7 +26,7 @@
 #include <camel/camel.h>
 
 #include <shell/e-shell.h>
-#include <libemail-engine/e-mail-junk-filter.h>
+#include <libemail-engine/libemail-engine.h>
 
 /* Standard GObject macros */
 #define E_TYPE_SPAM_ASSASSIN \
-- 
cgit v1.2.3