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, 9 deletions

diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am
index fa1a400f03..6a7e9a8b6e 100644
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -28,6 +28,8 @@ libevolution_mail_importers_la_LIBADD =				\
 	$(top_builddir)/mail/libevolution-mail.la		\
 	$(top_builddir)/shell/libeshell.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
+	$(top_builddir)/libemail-engine/libemail-engine.la \
+	$(top_builddir)/libemail-utils/libemail-utils.la		\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(GTKHTML_LIBS)
diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c
index 832bf749ea..288d9fb736 100644
--- a/mail/importers/elm-importer.c
+++ b/mail/importers/elm-importer.c
@@ -40,7 +40,7 @@
 
 #include "mail-importer.h"
 
-#include "mail/mail-mt.h"
+#include "libemail-utils/mail-mt.h"
 #include "mail/e-mail-backend.h"
 #include "e-util/e-import.h"
 #include "shell/e-shell.h"
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index c3d5f2f1b7..f6e5c63613 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -48,7 +48,7 @@
 #include "mail/em-folder-selection-button.h"
 #include "mail/em-folder-tree-model.h"
 #include "mail/em-folder-tree.h"
-#include "mail/mail-mt.h"
+#include "libemail-utils/mail-mt.h"
 
 #include "mail-importer.h"
 
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index 558359c636..716d99c991 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -39,9 +39,9 @@
 #include "e-util/e-util-private.h"
 #include "shell/e-shell-backend.h"
 
-#include "mail-mt.h"
-#include "mail-tools.h"
-#include "e-mail-session.h"
+#include "libemail-utils/mail-mt.h"
+#include "libemail-engine/mail-tools.h"
+#include "libemail-engine/e-mail-session.h"
 
 #include "mail-importer.h"
 
@@ -277,9 +277,9 @@ mail_importer_import_mbox_sync (EMailSession *session,
 	m->path = g_strdup (path);
 	m->uri = g_strdup (folderuri);
 	if (cancellable)
-		e_activity_set_cancellable (m->base.activity, cancellable);
+		m->base.cancellable = cancellable;
 
-	cancellable = e_activity_get_cancellable (m->base.activity);
+	cancellable = m->base.cancellable;
 
 	import_mbox_exec (m, cancellable, &m->base.error);
 	import_mbox_done (m);
diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h
index d66ed464ec..bd0335c299 100644
--- a/mail/importers/mail-importer.h
+++ b/mail/importers/mail-importer.h
@@ -26,7 +26,7 @@
 
 #include <e-util/e-import.h>
 #include <camel/camel.h>
-#include <mail/e-mail-session.h>
+#include <libemail-engine/e-mail-session.h>
 
 EImportImporter *mbox_importer_peek (void);
 
diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index 1ba44583ab..3ecfbbc5df 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -43,7 +43,7 @@
 
 #include "mail-importer.h"
 
-#include "mail/mail-mt.h"
+#include "libemail-utils/mail-mt.h"
 #include "mail/e-mail-backend.h"
 #include "e-util/e-import.h"
 #include "shell/e-shell.h"