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, 1 insertions, 2 deletions

diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index b3f1590440..1dc13c5f2e 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -35,7 +35,6 @@
 #include "filter/vfolder-context.h"
 #include "filter/filter-option.h"
 #include "filter/filter-input.h"
-#include "filter/filter-driver.h"
 #include "mail.h" /*session*/
 #include "mail-tools.h"
 #include "mail-local.h"
@@ -291,7 +290,7 @@ mail_tool_make_message_attachment (CamelMimeMessage *message)
 }
 
 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)
 {
 	return mail_tool_uri_to_folder_noex (uri);
 }