kill filter_driver_set_session and filter_driver_set_rules and instead

	* filter-driver.c (filter_driver_new): kill
	filter_driver_set_session and filter_driver_set_rules and instead
	make filter_driver_new take the rules and a callback function it
	can use to turn URIs into folders.
	(open_folder): Use the callback function rather than calling camel
	directly: some URIs need special handling to turn them into stores
	and folders correctly, so let the mailer do that.

svn path=/trunk/; revision=3859

1 files changed, 3 insertions, 5 deletions

diff --git a/filter/filter-driver.h b/filter/filter-driver.h
index ad9afca53f..a7a752aecd 100644
--- a/filter/filter-driver.h
+++ b/filter/filter-driver.h
@@ -38,19 +38,17 @@ struct _FilterDriver {
 	GtkObject parent;
 
 	struct _FilterDriverPrivate *priv;
-
-	CamelSession *session;
 };
 
 struct _FilterDriverClass {
 	GtkObjectClass parent_class;
 };
 
+typedef CamelFolder *(*FilterFolderFetcher) (const char *uri);
+
 guint		filter_driver_get_type	(void);
-FilterDriver      *filter_driver_new	(void);
+FilterDriver      *filter_driver_new	(const char *system, const char *user, FilterFolderFetcher fetcher);
 
-void filter_driver_set_session(FilterDriver *, CamelSession *);
-int filter_driver_set_rules(FilterDriver *, const char *system, const char *filter);
 void filter_driver_set_global(FilterDriver *, const char *name, const char *value);
 
 /* apply rules to a folder, unmatched messages goto inbox, if not NULL */