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, 4 insertions, 4 deletions

diff --git a/mail/subscribe-dialog.c b/mail/subscribe-dialog.c
index bdbdf347bf..4026754a6e 100644
--- a/mail/subscribe-dialog.c
+++ b/mail/subscribe-dialog.c
@@ -490,7 +490,7 @@ subscribe_folder_foreach (int model_row, gpointer closure)
 }
 
 static void
-subscribe_folders (GtkWidget *widget, gpointer user_data)
+subscribe_folders (BonoboUIComponent *componet, gpointer user_data, const char *cname)
 {
 	SubscribeDialog *sc = SUBSCRIBE_DIALOG (user_data);
 
@@ -511,7 +511,7 @@ unsubscribe_folder_foreach (int model_row, gpointer closure)
 
 
 static void
-unsubscribe_folders (GtkWidget *widget, gpointer user_data)
+unsubscribe_folders (BonoboUIComponent *component, gpointer user_data, const char *cname)
 {
 	SubscribeDialog *sc = SUBSCRIBE_DIALOG (user_data);
 
@@ -520,7 +520,7 @@ unsubscribe_folders (GtkWidget *widget, gpointer user_data)
 }
 
 static void
-subscribe_refresh_list (GtkWidget *widget, gpointer user_data)
+subscribe_refresh_list (BonoboUIComponent *component, gpointer user_data, const char *cname)
 {
 	SubscribeDialog *sc = SUBSCRIBE_DIALOG (user_data);
 
@@ -893,7 +893,7 @@ populate_store_list (SubscribeDialog *sc)
 	g_slist_free (sources);
 	
 	news = mail_config_get_news ();
-	g_slist_foreach (news, (GFunc)populate_store_foreach, sc);
+	g_slist_foreach ((GSList *)news, (GFunc)populate_store_foreach, sc);
 
 	e_table_model_changed (sc->store_model);
 }