Added filter-url.[c,h].

2000-10-20  Jeffrey Stedfast  <fejj@helixcode.com>

	* Makefile.am: Added filter-url.[c,h].

	* filter-message-search.c (get_source): New callback to get the
	source url of the message being filtered.
	(filter_message_search): Now takes a source argument.

	* filter-element.c (filter_element_new_type_name): Added code to
	handle URL types.

	* filter-url.[c,h]: New filter object to handle URLs (ie in the
	case of filtering on source url). FIXME: find a way to populate
	the source combo box (including mail-config.h breaks the build in
	the addressbook - how does including mail-tools.h not break the
	build???)

	* filtertypes.xml: Added the source filter type and added the
	move-to action.

	* filter-driver.c (do_move): New callback, a "Copy" action should
	just copy the message to another location while a Move should both
	copy the message to a new location and delete it from the source
	location.
	(do_delete): Set the deleted flag on the message info.
	(filter_driver_filter_message): Now returns void as we don't care
	if it was copied or not in the caller functions. Also check the
	CamelMessageInfo being passed in - if the message has been marked
	as deleted prior to being filtered, then return immediately as we
	don't want to apply filter actions to deleted messages.

svn path=/trunk/; revision=6094

1 files changed, 9 insertions, 8 deletions

diff --git a/filter/filter-driver.h b/filter/filter-driver.h
index 90a6db6a7b..1da1fc37ff 100644
--- a/filter/filter-driver.h
+++ b/filter/filter-driver.h
@@ -63,20 +63,21 @@ guint         filter_driver_get_type (void);
 FilterDriver  *filter_driver_new     (FilterContext *ctx, FilterGetFolderFunc fetcher, void *data);
 
 /* modifiers */
-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_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 */
-gboolean filter_driver_filter_message	(FilterDriver *driver, CamelMimeMessage *message, CamelMessageInfo *info,
-					 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);
+void    filter_driver_filter_message      (FilterDriver *driver, CamelMimeMessage *message, CamelMessageInfo *info,
+					   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);
+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 */