Fixed some warnings.

2000-08-10  Christopher James Lahey  <clahey@helixcode.com>

	* filter-driver.c, filter-driver.h, filter-folder.c,
	rule-context.c, vfolder-editor.c: Fixed some warnings.

svn path=/trunk/; revision=4720

5 files changed, 16 insertions, 3 deletions

diff --git a/filter/ChangeLog b/filter/ChangeLog
index e2663340aa..e510a5952a 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
+
+	* filter-driver.c, filter-driver.h, filter-folder.c,
+	rule-context.c, vfolder-editor.c: Fixed some warnings.
+
 2000-08-10  Peter Williams  <peterw@helixcode.com>
 
 	* filter-driver.c (do_filter_mail): Fix the infinite fetchmail.
diff --git a/filter/filter-driver.c b/filter/filter-driver.c
index 6269bb5bd8..d27bbe4acf 100644
--- a/filter/filter-driver.c
+++ b/filter/filter-driver.c
@@ -229,6 +229,7 @@ filter_driver_new (FilterContext *context, FilterGetFolderFunc get_folder, void
 }
 
 
+#if 0
 void filter_driver_set_global(FilterDriver *d, const char *name, const char *value)
 {
 	struct _FilterDriverPrivate *p = _PRIVATE (d);
@@ -241,6 +242,7 @@ void filter_driver_set_global(FilterDriver *d, const char *name, const char *val
 		g_hash_table_insert (p->globals, g_strdup (name), g_strdup (value));
 	}
 }
+#endif
 
 static ESExpResult *
 do_delete (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterDriver *driver)
@@ -398,11 +400,13 @@ close_folders (FilterDriver *driver)
 	return 0;
 }
 
+#if 0
 static void
 free_key (gpointer key, gpointer value, gpointer user_data)
 {
 	g_free (key);
 }
+#endif
 
 static const mail_operation_spec op_filter_mail =
 {
@@ -531,7 +535,9 @@ do_filter_mail (gpointer in_data, gpointer op_data, CamelException *ex)
 			}
 		}
 
+#ifndef NO_WARNINGS
 #warning "Must check expression parsed and executed properly?"
+#endif
 		e_sexp_input_text(p->eval, a->str, strlen(a->str));
 		e_sexp_parse(p->eval);
 		r = e_sexp_eval(p->eval);
diff --git a/filter/filter-folder.c b/filter/filter-folder.c
index 1fcab58599..85363f7caa 100644
--- a/filter/filter-folder.c
+++ b/filter/filter-folder.c
@@ -175,7 +175,7 @@ static void button_clicked(GtkButton *button, FilterFolder *ff)
 {
 #ifdef SHELL
 	const char *allowed_types[] = { "mail", NULL };
-	char *def, *physical_uri, *evolution_uri, *str;
+	char *def, *physical_uri, *evolution_uri;
 
 	def = ff->uri ? ff->uri : "";
 
@@ -238,7 +238,6 @@ static GtkWidget *get_widget(FilterElement *fe)
 	FilterFolder *ff = (FilterFolder *)fe;
 	GtkButton *button;
 	GtkLabel *label;
-	char *name;
 
 	if (ff->name && ff->name[0])
 		label = (GtkLabel *)gtk_label_new(g_basename (ff->name));
diff --git a/filter/rule-context.c b/filter/rule-context.c
index 9621599b0f..c297ae1a61 100644
--- a/filter/rule-context.c
+++ b/filter/rule-context.c
@@ -346,7 +346,9 @@ void		rule_context_add_rule(RuleContext *f, FilterRule *new)
 static void
 new_rule_clicked(GtkWidget *w, int button, RuleContext *context)
 {
+#ifndef NO_WARNINGS
 #warning "Need a changed signal for this to work best"
+#endif
 	if (button == 0) {
 		FilterRule *rule = gtk_object_get_data((GtkObject *)w, "rule");
 		char *user = gtk_object_get_data((GtkObject *)w, "path");
diff --git a/filter/vfolder-editor.c b/filter/vfolder-editor.c
index 3e4c4f0bcc..0d083c7c4f 100644
--- a/filter/vfolder-editor.c
+++ b/filter/vfolder-editor.c
@@ -24,6 +24,7 @@
 
 #include "vfolder-editor.h"
 #include "vfolder-context.h"
+#include "vfolder-rule.h"
 
 #define d(x)
 
@@ -142,7 +143,7 @@ static void rule_add(GtkWidget *widget, struct _editor_data *data)
 	
 	d(printf("add rule\n"));
 	/* create a new rule with 1 match and 1 action */
-	rule = vfolder_rule_new();
+	rule = (FilterRule *) vfolder_rule_new();
 
 	part = rule_context_next_part(data->f, NULL);
 	filter_rule_add_part(rule, filter_part_clone(part));