7 files changed, 14 insertions, 14 deletions
diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c
index 965454da8b..d7a71cfd82 100644
--- a/mail/mail-accounts.c
+++ b/mail/mail-accounts.c
@@ -256,6 +256,7 @@ mail_default (GtkButton *button, gpointer data)
 	}
 }
 
+#ifdef ENABLE_NNTP
 /* news callbacks */
 static void
 news_select (GtkCList *clist, gint row, gint column, GdkEventButton *event, gpointer data)
@@ -327,6 +328,7 @@ news_delete (GtkButton *button, gpointer data)
 		}
 	}
 }
+#endif /* ENABLE_NNTP */
 
 static void
 construct (MailAccountsDialog *dialog)
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 2e03014dcb..b98a16c9e8 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -43,7 +43,6 @@
 #include "folder-browser.h"
 #include "subscribe-dialog.h"
 #include "filter/filter-editor.h"
-#include "filter/filter-driver.h"
 #include <gal/e-table/e-table.h>
 #include <gal/widgets/e-gui-utils.h>
 #include "e-messagebox.h"
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 363c9a282a..0756a290c6 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -621,7 +621,7 @@ send_queue_send(struct _mail_msg *mm)
 		char *destination;
 		int pc = (100 * i)/uids->len;
 
-		report_status(m, FILTER_STATUS_START, pc, "Sending message %d of %d", i+1, uids->len);
+		report_status(m, CAMEL_FILTER_STATUS_START, pc, "Sending message %d of %d", i+1, uids->len);
 		
 		message = camel_folder_get_message(m->queue, uids->pdata[i], &mm->ex);
 		if (camel_exception_is_set(&mm->ex))
@@ -644,9 +644,9 @@ send_queue_send(struct _mail_msg *mm)
 	}
 
 	if (camel_exception_is_set(&mm->ex))
-		report_status(m, FILTER_STATUS_END, 100, "Failed on message %d of %d", i+1, uids->len);
+		report_status(m, CAMEL_FILTER_STATUS_END, 100, "Failed on message %d of %d", i+1, uids->len);
 	else
-		report_status(m, FILTER_STATUS_END, 100, "Complete.");
+		report_status(m, CAMEL_FILTER_STATUS_END, 100, "Complete.");
 
 	camel_folder_free_uids(m->queue, uids);
 
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 980a242522..0762733bf2 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -340,8 +340,8 @@ receive_status (CamelFilterDriver *driver, enum camel_filter_status_t status, in
 	   yet, so if this is necessary its not too hard to add */
 	/* the mail_gui_port receiver will free everything for us */
 	switch (status) {
-	case FILTER_STATUS_START:
-	case FILTER_STATUS_END:
+	case CAMEL_FILTER_STATUS_START:
+	case CAMEL_FILTER_STATUS_END:
 		m = mail_msg_new(&status_op, NULL, sizeof(*m));
 		m->desc = g_strdup(desc);
 		m->pc = pc;
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);
 }
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, ...);
 
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);
 }