Introduce libemail-engine and libemail-utils.

These libraries are bound for E-D-S so they live at the lowest layer of
Evolution for now -- even libeutil can link to them (but please don't).

This is the first step toward moving mail handing to a D-Bus service.

6 files changed, 11 insertions, 7 deletions

diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c
index 7efddcffbf..c04722e42f 100644
--- a/capplet/anjal-settings-main.c
+++ b/capplet/anjal-settings-main.c
@@ -36,7 +36,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libedataserverui/e-passwords.h>
-#include <mail/mail-mt.h>
+#include <libemail-utils/mail-mt.h>
 #include "settings/mail-capplet-shell.h"
 #include <libedataserver/e-categories.h>
 
diff --git a/capplet/settings/Makefile.am b/capplet/settings/Makefile.am
index 1367fd5a75..db899e0f6c 100644
--- a/capplet/settings/Makefile.am
+++ b/capplet/settings/Makefile.am
@@ -59,6 +59,8 @@ libevolution_mail_settings_la_LIBADD = 				\
 	$(top_builddir)/filter/libfilter.la		\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(top_builddir)/shell/libeshell.la		\
+	$(top_builddir)/libemail-utils/libemail-utils.la \
+	$(top_builddir)/libemail-engine/libemail-engine.la \
 	$(top_builddir)/e-util/libeutil.la
 
 libevolution_mail_settings_la_LDFLAGS =  $(NO_UNDEFINED)
diff --git a/capplet/settings/anjal-mail-view.c b/capplet/settings/anjal-mail-view.c
index c0926536cb..232b8ff118 100644
--- a/capplet/settings/anjal-mail-view.c
+++ b/capplet/settings/anjal-mail-view.c
@@ -28,7 +28,7 @@
 #include <glib/gi18n.h>
 #include "mail/em-utils.h"
 #include "mail/mail-send-recv.h"
-#include "mail/mail-ops.h"
+#include "libemail-engine/mail-ops.h"
 #include "mail/em-folder-tree.h"
 
 struct  _AnjalMailViewPrivate {
diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c
index 707efe3f35..3d3e015e94 100644
--- a/capplet/settings/mail-capplet-shell.c
+++ b/capplet/settings/mail-capplet-shell.c
@@ -38,8 +38,8 @@
 
 #include <mail/em-utils.h>
 #include <mail/em-composer-utils.h>
-#include <mail/mail-config.h>
-#include <mail/mail-mt.h>
+#include <libemail-engine/mail-config.h>
+#include <libemail-utils/mail-mt.h>
 
 #include <shell/e-shell.h>
 
diff --git a/capplet/settings/mail-settings-view.c b/capplet/settings/mail-settings-view.c
index a699dca9ea..992f705826 100644
--- a/capplet/settings/mail-settings-view.c
+++ b/capplet/settings/mail-settings-view.c
@@ -25,10 +25,12 @@
 #endif
 
 #include <glib/gi18n.h>
-#include "mail-settings-view.h"
 #include <libedataserver/e-account-list.h>
+
+#include <libemail-utils/e-account-utils.h>
+
+#include "mail-settings-view.h"
 #include "mail-view.h"
-#include <e-util/e-account-utils.h>
 
 struct _MailSettingsViewPrivate {
 	GtkWidget *tab_str;
diff --git a/capplet/settings/mail-view.c b/capplet/settings/mail-view.c
index 53daf3fd08..4477be517a 100644
--- a/capplet/settings/mail-view.c
+++ b/capplet/settings/mail-view.c
@@ -27,7 +27,7 @@
 #include <glib/gi18n.h>
 #include "mail/em-utils.h"
 #include "mail/mail-send-recv.h"
-#include "mail/mail-ops.h"
+#include "libemail-engine/mail-ops.h"
 #include "mail-view.h"
 #ifndef ANJAL_SETTINGS
 #include "mail-folder-view.h"