add a "string" type

	* filter-xml.[ch]: add a "string" type

	* filtertype.xml, vfoldertypes.xml: Use type="string" rather than
	"folder" for subject/body matching.

	* filter-arg-types.c: Update some strings for "text" input. Fix
	some warnings (including one that pointed out a real bug).

	* filter-arg.c, filter-druid.c, filter-format.c: fix warnings

svn path=/trunk/; revision=4025

1 files changed, 8 insertions, 14 deletions

diff --git a/filter/filter-arg.c b/filter/filter-arg.c
index 8d659d7af9..622986ce43 100644
--- a/filter/filter-arg.c
+++ b/filter/filter-arg.c
@@ -33,7 +33,7 @@ static void filter_arg_init       (FilterArg      *gspaper);
 
 struct _FilterArgPrivate {
 	GtkWidget *dialogue;	/* editor widget */
-	xmlNodePtr *oldargs;
+	xmlNodePtr oldargs;
 };
 
 static GtkObjectClass *parent_class;
@@ -100,10 +100,10 @@ edit_values_nothing(FilterArg *arg)
 	/* empty */
 }
 
-static void *
-edit_value_nothing(FilterArg *arg, void *v)
+static int
+edit_value_nothing(FilterArg *arg, int index)
 {
-	return v;
+	return index;
 }
 
 static void
@@ -112,12 +112,6 @@ free_value_nothing(FilterArg *arg, void *v)
 	/* empty */
 }
 
-static gint
-compare_pointers(gpointer a, gpointer b)
-{
-	return a == b;
-}
-
 static void
 filter_arg_class_init (FilterArgClass *class)
 {
@@ -434,9 +428,9 @@ filter_arg_edit_clicked(GnomeDialog *d, int button, struct filter_arg_edit *edat
 		while (edata->arg->values) {
 			filter_arg_remove(edata->arg, edata->arg->values->data);
 		}
-		filter_arg_values_add_xml(edata->arg, (xmlNodePtr) p->oldargs);
+		filter_arg_values_add_xml(edata->arg, p->oldargs);
 	}
-	xmlFreeNodeList((xmlNodePtr) p->oldargs);
+	xmlFreeNodeList(p->oldargs);
 	p->oldargs = NULL;
 	p->dialogue = NULL;
 	gnome_dialog_close(d);
@@ -451,8 +445,8 @@ filter_arg_edit_destroy(GnomeDialog *d, struct filter_arg_edit *edata)
 		while (edata->arg->values) {
 			filter_arg_remove(edata->arg, edata->arg->values->data);
 		}
-		filter_arg_values_add_xml(edata->arg, (xmlNodePtr) p->oldargs);
-		xmlFreeNodeList((xmlNodePtr) p->oldargs);
+		filter_arg_values_add_xml(edata->arg, p->oldargs);
+		xmlFreeNodeList(p->oldargs);
 		p->oldargs = NULL;
 	}