From 61ae36351b24cc676f60483d576706bf827f2987 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 17 Jan 2012 11:07:19 -0500
Subject: 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.
---
 modules/online-accounts/Makefile.am                 | 1 +
 modules/online-accounts/camel-sasl-xoauth.c         | 6 +++---
 modules/online-accounts/e-online-accounts-google.c  | 2 +-
 modules/online-accounts/evolution-online-accounts.c | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'modules/online-accounts')

diff --git a/modules/online-accounts/Makefile.am b/modules/online-accounts/Makefile.am
index ccb7ada29a..f449247ec9 100644
--- a/modules/online-accounts/Makefile.am
+++ b/modules/online-accounts/Makefile.am
@@ -18,6 +18,7 @@ libevolution_module_online_accounts_la_SOURCES =		\
 libevolution_module_online_accounts_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
+	$(top_builddir)/libemail-utils/libemail-utils.la  \
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(GOA_LIBS)
diff --git a/modules/online-accounts/camel-sasl-xoauth.c b/modules/online-accounts/camel-sasl-xoauth.c
index edf5c6eec3..7b1a59aa24 100644
--- a/modules/online-accounts/camel-sasl-xoauth.c
+++ b/modules/online-accounts/camel-sasl-xoauth.c
@@ -20,11 +20,11 @@
 #include <config.h>
 #endif
 
-#include <e-util/e-account-utils.h>
+#include <glib/gi18n-lib.h>
 
-#include "camel-sasl-xoauth.h"
+#include <libemail-utils/e-account-utils.h>
 
-#include <glib/gi18n-lib.h>
+#include "camel-sasl-xoauth.h"
 
 #define GOA_API_IS_SUBJECT_TO_CHANGE
 #include <goa/goa.h>
diff --git a/modules/online-accounts/e-online-accounts-google.c b/modules/online-accounts/e-online-accounts-google.c
index e71b8d16cb..709eb3bb8e 100644
--- a/modules/online-accounts/e-online-accounts-google.c
+++ b/modules/online-accounts/e-online-accounts-google.c
@@ -29,7 +29,7 @@
 #include <libecal/e-cal.h>
 #include <libebook/e-book.h>
 
-#include <e-util/e-account-utils.h>
+#include <libemail-utils/e-account-utils.h>
 
 /* This is the property name or URL parameter under which we
  * embed the GoaAccount ID into an EAccount or ESource object. */
diff --git a/modules/online-accounts/evolution-online-accounts.c b/modules/online-accounts/evolution-online-accounts.c
index d127f4d096..6efeaba33e 100644
--- a/modules/online-accounts/evolution-online-accounts.c
+++ b/modules/online-accounts/evolution-online-accounts.c
@@ -30,7 +30,8 @@
 #include <libedataserver/e-account-list.h>
 
 #include <shell/e-shell.h>
-#include <e-util/e-account-utils.h>
+
+#include <libemail-utils/e-account-utils.h>
 
 #include "camel-sasl-xoauth.h"
 #include "e-online-accounts-google.h"
-- 
cgit