Added a #include <gnome-xml/parser.h> as this was needed (since we used

2000-06-26  Jeffrey Stedfast  <fejj@helixcode.com>

	* filter-editor.c: Added a #include <gnome-xml/parser.h> as this
	was needed (since we used the xml parser...)
	(druid_dialogue_clicked): Do we want to use struct filter_option
	or do we instead want to use struct filter_optionrule as we had before?
	Since the function we pass the data to expects filter_option, I suspect
	that that is what we want.

	* filter-format.h (filter_description_html_write): Renamed from
	description_html_write in order to match function name in
	filter-format.c

	* filter-druid.c (option_name_changed): Fixed a memory leak (Free'd
	a filter description list).

	* filter-arg-types.c (arg_folder_edit_values): Free'd GList data in
	argin->values.

	* filter-driver.c (filter_driver_set_rules): Added code to free an
	xmlDoc and some other data.

	* filter-arg.h: Add prototypes for filter_arg_write_html() and
	filter_arg_write_text();

	* filter-arg-types.c: Lets see if we can't get rid of some of these
	warnings... (use some casts to make warnings go away)
	(arg_address_edit_value): Lets make sure that ad exists before looking
	at member data.

svn path=/trunk/; revision=3741

1 files changed, 7 insertions, 3 deletions

diff --git a/filter/filter-driver.c b/filter/filter-driver.c
index 4a445e75be..92d337f958 100644
--- a/filter/filter-driver.c
+++ b/filter/filter-driver.c
@@ -180,7 +180,7 @@ filter_driver_finalise (GtkObject *obj)
 FilterDriver *
 filter_driver_new (void)
 {
-	FilterDriver *new = FILTER_DRIVER ( gtk_type_new (filter_driver_get_type ()));
+	FilterDriver *new = FILTER_DRIVER (gtk_type_new (filter_driver_get_type ()));
 	return new;
 }
 
@@ -208,6 +208,10 @@ int filter_driver_set_rules(FilterDriver *d, const char *description, const char
 	filt = xmlParseFile(filter);
 	p->options = filter_load_optionset(filt, p->rules);
 
+#warning "Zucchi: is this safe? Doesn't seem to cause problems..."
+	filter_load_ruleset_free (p->rules);
+	xmlFreeDoc (desc);
+	
 	return 0;
 }
 
@@ -494,7 +498,7 @@ close_folder(void *key, void *value, void *data)
 	FilterDriver *d = data;
 	struct _FilterDriverPrivate *p = _PRIVATE(d);
 
-	printf("closing folder: %s\n", key);
+	printf("closing folder: %s\n", (char *) key);
 
 	g_free(key);
 	camel_folder_sync(f, FALSE, p->ex);
@@ -566,7 +570,7 @@ filter_driver_run(FilterDriver *d, CamelFolder *source, CamelFolder *inbox)
 		while (m) {
 			GList *n = m->next;
 
-			printf("matched: %s\n", m->data);
+			printf("matched: %s\n", (char *) m->data);
 
 			/* for all matching id's, so we can work out what to default */
 			if (g_hash_table_lookup(p->processed, m->data) == NULL) {