Use filter_driver_log() where appropriate. (do_copy): Use the service url

2000-11-01  Jeffrey Stedfast  <fejj@helixcode.com>

	* filter-driver.c (filter_driver_filter_message): Use
	filter_driver_log() where appropriate.
	(do_copy): Use the service url for the path rather than the
	folder->full_name because that'll only get you a "/mbox" which is
	entirely useless. Replace occurences of report_status with
	filter_driver_log.
	(do_move): Same.
	(report_status): Don't use this for logging anymore, use only for
	reporting the status back to the caller.
	(filter_driver_log): Renamed from filter_driver_status_log. Now
	ONLY handles file logging and is for INTERNAL USE ONLY.
	(do_flag): Replace occurences of report_status with
	filter_driver_log.
	(do_score): Same.
	(do_colour): Same.
	(do_stop): Same.

svn path=/trunk/; revision=6340

1 files changed, 3 insertions, 6 deletions

diff --git a/filter/filter-driver.h b/filter/filter-driver.h
index 471118631e..8c6454c9b4 100644
--- a/filter/filter-driver.h
+++ b/filter/filter-driver.h
@@ -47,6 +47,7 @@ struct _FilterDriverClass {
 	GtkObjectClass parent_class;
 };
 
+/* FIXME: this maybe should change... */
 /* type of status for a status report */
 enum filter_status_t {
 	FILTER_STATUS_NONE,
@@ -58,28 +59,24 @@ enum filter_status_t {
 
 typedef CamelFolder * (*FilterGetFolderFunc) (FilterDriver *, const char *uri, void *data);
 /* report status */
-typedef void (FDStatusFunc)(FilterDriver *driver, enum filter_status_t status, const char *desc, CamelMimeMessage *msg, void *data);
+typedef void (FDStatusFunc)(FilterDriver *driver, enum filter_status_t status, const char *desc, void *data);
 
 guint         filter_driver_get_type (void);
 FilterDriver  *filter_driver_new     (FilterContext *ctx, FilterGetFolderFunc fetcher, void *data);
 
 /* modifiers */
+void    filter_driver_set_logfile         (FilterDriver *d, FILE *logfile);
 void	filter_driver_set_status_func     (FilterDriver *d, FDStatusFunc *func, void *data);
 void	filter_driver_set_default_folder  (FilterDriver *d, CamelFolder *def);
 
 /*void filter_driver_set_global(FilterDriver *, const char *name, const char *value);*/
 
-/* filter a message - returns TRUE if the message was filtered into some location other than inbox */
 void    filter_driver_filter_message      (FilterDriver *driver, CamelMimeMessage *message, CamelMessageInfo *info,
 					   const char *source_url, const char *source, CamelException *ex);
 void    filter_driver_filter_mbox         (FilterDriver *driver, const char *mbox, const char *source, CamelException *ex);
 void    filter_driver_filter_folder       (FilterDriver *driver, CamelFolder *folder, const char *source,
 					   GPtrArray *uids, gboolean remove, CamelException *ex);
 
-/* convenience function to log the status, data should be the FILE * of the logfile */
-void    filter_driver_status_log        (FilterDriver *driver, enum filter_status_t status,
-					 const char *desc, CamelMimeMessage *msg, void *data);
-
 #if 0
 /* generate the search query/action string for a filter option */
 void filter_driver_expand_option (FilterDriver *d, GString *s, GString *action, struct filter_option *op);