Implement this, based on code that used to be in mail-ops.c

	* mail-session.c (get_filter_driver): Implement this, based on
	code that used to be in mail-ops.c

	* mail-ops.c (mail_load_filter_context, setup_filter_driver):
	Moved into MailSession::get_filter_driver.
	(filter_get_folder): Moved to mail-session.c
	(mail_filter_folder, mail_filter_on_demand, mail_fetch_mail,
	mail_send_mail, mail_send_queue): Remove FilterContext args, use
	camel_session_get_filter_driver.

	* mail-send-recv.c (mail_send_receive, mail_receive_uri):
	Remove FilterContexts

svn path=/trunk/; revision=10682

1 files changed, 3 insertions, 11 deletions

diff --git a/mail/mail-ops.h b/mail/mail-ops.h
index cf8cc892ff..a7b777116c 100644
--- a/mail/mail-ops.h
+++ b/mail/mail-ops.h
@@ -36,14 +36,9 @@ extern "C" {
 #include "camel/camel-mime-message.h"
 #include "camel/camel-operation.h"
 
-#include "filter/filter-context.h"
-
 #include "evolution-storage.h"	/*EvolutionStorage */
 #include "e-util/e-msgport.h"
 
-/* utility functions */
-FilterContext *mail_load_filter_context (void);
-
 void mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageInfo *info,
 		       void (*done)(CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, int ok, void *data),
 		       void *data);
@@ -133,24 +128,21 @@ int mail_update_subfolders (CamelStore *store, EvolutionStorage *storage,
 
 /* yeah so this is messy, but it does a lot, maybe i can consolidate all user_data's to be the one */
 void mail_send_queue (CamelFolder *queue, const char *destination,
-		      FilterContext *fc, const char *type,
-		      CamelOperation *cancel,
+		      const char *type, CamelOperation *cancel,
 		      CamelFilterGetFolderFunc get_folder, void *get_data,
 		      CamelFilterStatusFunc *status, void *status_data,
 		      void (*done)(char *destination, void *data),
 		      void *data);
 
 void mail_fetch_mail (const char *source, int keep,
-		      FilterContext *fc, const char *type,
-		      CamelOperation *cancel,
+		      const char *type, CamelOperation *cancel,
 		      CamelFilterGetFolderFunc get_folder, void *get_data,
 		      CamelFilterStatusFunc *status, void *status_data,
 		      void (*done)(char *source, void *data),
 		      void *data);
 
 void mail_filter_folder (CamelFolder *source_folder, GPtrArray *uids,
-			 FilterContext *fc, const char *type,
-			 CamelOperation *cancel);
+			 const char *type, CamelOperation *cancel);
 
 /* convenience function for above */
 void mail_filter_on_demand (CamelFolder *folder, GPtrArray *uids);