s/filter-driver.h/camel-filter-driver.h/ and update first arg of

	* mail-tools.h: s/filter-driver.h/camel-filter-driver.h/ and
	update first arg of mail_too_filter_get_folder_func

	* mail-tools.c (mail_tool_filter_get_folder_func): Update first
	arg to CamelFilterDriver *

	* mail-send-recv.c (receive_status):
	* mail-ops.c (send_queue_send): s/FILTER/CAMEL_FILTER/

	* mail-callbacks.c: Remove filter-driver.h include

	* mail-accounts.c: Put the news functions inside #ifdef
	ENABLE_NNTP to prevent warnings about unused statis functions.

	* subscribe-dialog.c (subscribe_folders, unsubscribe_folders,
	subscribe_refresh_list): Update prototype to match BONOBO_UI_VERB.
	(populate_store_list): add a de-constifying cast

svn path=/trunk/; revision=7708

1 files changed, 2 insertions, 2 deletions

diff --git a/mail/mail-tools.h b/mail/mail-tools.h
index bc4a09373c..4601b71dc1 100644
--- a/mail/mail-tools.h
+++ b/mail/mail-tools.h
@@ -26,7 +26,7 @@
 #define MAIL_TOOLS_H
 
 #include <camel/camel.h>
-#include <filter/filter-driver.h> /*eek*/
+#include <camel/camel-filter-driver.h> /*eek*/
 
 /* A global recursive lock on Camel */
 void mail_tool_camel_lock_up (void);
@@ -93,7 +93,7 @@ mail_lookup_url_table (CamelMimeMessage *mime_message);
 
 /* Appropriate for filter_driver_run */
 CamelFolder *
-mail_tool_filter_get_folder_func (FilterDriver *d, const char *uri, void *data);
+mail_tool_filter_get_folder_func (CamelFilterDriver *d, const char *uri, void *data);
 
 gchar *mail_tool_quote_message (CamelMimeMessage *message, const char *fmt, ...);