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.

1 files changed, 16 insertions, 11 deletions

diff --git a/mail/message-list.c b/mail/message-list.c
index 98fd90babb..405e9d08cd 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -58,13 +58,16 @@
 #include "table/e-tree-memory-callbacks.h"
 #include "table/e-tree-memory.h"
 
-#include "e-mail-label-list-store.h"
-#include "em-utils.h"
-#include "mail-config.h"
-#include "mail-mt.h"
-#include "mail-ops.h"
-#include "mail-tools.h"
-#include "message-list.h"
+#include "libemail-utils/mail-mt.h"
+#include "libemail-engine/e-mail-utils.h"
+#include "libemail-engine/mail-config.h"
+#include "libemail-engine/mail-ops.h"
+#include "libemail-engine/mail-tools.h"
+
+#include "mail/e-mail-label-list-store.h"
+#include "mail/e-mail-ui-session.h"
+#include "mail/em-utils.h"
+#include "mail/message-list.h"
 
 #if HAVE_CLUTTER
 #include <clutter/clutter.h>
@@ -1709,7 +1712,8 @@ ml_tree_value_at_ex (ETreeModel *etm,
 			/* Get all applicable labels. */
 			struct LabelsData ld;
 
-			ld.store = e_mail_session_get_label_store (session);
+			ld.store = e_mail_ui_session_get_label_store (
+				E_MAIL_UI_SESSION (session));
 			ld.labels_tag2iter = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) gtk_tree_iter_free);
 			for_node_and_subtree_if_collapsed (message_list, path, msg_info, add_all_labels_foreach, &ld);
 
@@ -1791,7 +1795,8 @@ ml_tree_value_at_ex (ETreeModel *etm,
 		struct LabelsData ld;
 		GString *result = g_string_new ("");
 
-		ld.store = e_mail_session_get_label_store (session);
+		ld.store = e_mail_ui_session_get_label_store (
+			E_MAIL_UI_SESSION (session));
 		ld.labels_tag2iter = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) gtk_tree_iter_free);
 		for_node_and_subtree_if_collapsed (message_list, path, msg_info, add_all_labels_foreach, &ld);
 
@@ -4764,7 +4769,7 @@ regen_list_done (struct _regen_list_msg *m)
 	GCancellable *cancellable;
 	gboolean searching;
 
-	cancellable = e_activity_get_cancellable (m->base.activity);
+	cancellable = m->base.cancellable;
 
 	if (m->ml->priv->destroyed)
 		return;
@@ -4956,7 +4961,7 @@ mail_regen_cancel (MessageList *ml)
 			MailMsg *mm = link->data;
 			GCancellable *cancellable;
 
-			cancellable = e_activity_get_cancellable (mm->activity);
+			cancellable = mm->cancellable;
 			g_cancellable_cancel (cancellable);
 		}