Give MailSession a permanent home.

Global variables in shared libraries are a bad idea.  EMailBackend now
owns the MailSession instance, which is actually now EMailSession.

Move the blocking utility functions in mail-tools.c to e-mail-session.c
and add asynchronous variants.  Same approach as Camel.

Replace EMailReader.get_shell_backend() with EMailReader.get_backend(),
which returns an EMailBackend.  Easier access to the EMailSession.

1 files changed, 27 insertions, 10 deletions

diff --git a/mail/mail-autofilter.h b/mail/mail-autofilter.h
index 7e385eb36f..35e5c3aac1 100644
--- a/mail/mail-autofilter.h
+++ b/mail/mail-autofilter.h
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef _MAIL_AUTOFILTER_H
-#define _MAIL_AUTOFILTER_H
+#ifndef MAIL_AUTOFILTER_H
+#define MAIL_AUTOFILTER_H
 
 #include <camel/camel.h>
 
@@ -37,15 +37,32 @@ enum {
 	AUTO_MLIST = 8
 };
 
-EFilterRule *em_vfolder_rule_from_message (EMVFolderContext *context, CamelMimeMessage *msg, gint flags, const gchar *source);
-EFilterRule *filter_rule_from_message (EMFilterContext *context, CamelMimeMessage *msg, gint flags);
-EFilterRule *em_vfolder_rule_from_address (EMVFolderContext *context, CamelInternetAddress *addr, gint flags, const gchar *source);
+EFilterRule *	em_vfolder_rule_from_message	(EMVFolderContext *context,
+						 CamelMimeMessage *msg,
+						 gint flags,
+						 const gchar *source);
+EFilterRule *	filter_rule_from_message	(EMFilterContext *context,
+						 CamelMimeMessage *msg,
+						 gint flags);
+EFilterRule *	em_vfolder_rule_from_address	(EMVFolderContext *context,
+						 CamelInternetAddress *addr,
+						 gint flags,
+						 const gchar *source);
 
 /* easiest place to put this */
-void  filter_gui_add_from_message (CamelMimeMessage *msg, const gchar *source, gint flags);
+void		filter_gui_add_from_message	(EMailSession *session,
+						 CamelMimeMessage *msg,
+						 const gchar *source,
+						 gint flags);
 
-/* Also easiest place for these, we should really share a global rule context for this stuff ... */
-void mail_filter_rename_uri (CamelStore *store, const gchar *olduri, const gchar *newuri);
-void mail_filter_delete_uri (CamelStore *store, const gchar *uri);
+/* Also easiest place for these, we should really
+ * share a global rule context for this stuff ... */
+void		mail_filter_rename_uri		(EMailSession *session,
+						 CamelStore *store,
+						 const gchar *olduri,
+						 const gchar *newuri);
+void		mail_filter_delete_uri		(EMailSession *session,
+						 CamelStore *store,
+						 const gchar *uri);
 
-#endif
+#endif /* MAIL_AUTOFILTER_H */