** fixes for #10781

2002-07-10  Not Zed  <NotZed@Ximian.com>

        ** fixes for #10781

        * filter-int.c (xml_encode):
        (xml_decode): Handle encoding/decoding with a type name, in a
        manner compatible with the score/label elemtns.
        (filter_int_new_type): New constructor to create a generic 'int'
        type.

        * filter-score.c: Removed.  Now relies on using a filter-int with
        appropriate settings.

        * filter-label.[ch]: Now inherits from filter-int.

        * rule-context.c (rule_context_revert): New method to revert a
        filter context back to a user-file's definition.
        (revert): implementation.

        * filter-rule.h: Added new virtual method _eq and wrapper, and
        fixed all subclasses to implement it.

        * filter-element.h: Added new virtual method _eq and wrapper.
        Fixed all subclasses to implement it.

svn path=/trunk/; revision=17448

1 files changed, 25 insertions, 0 deletions

diff --git a/filter/vfolder-rule.c b/filter/vfolder-rule.c
index 36b381eb06..053561b4eb 100644
--- a/filter/vfolder-rule.c
+++ b/filter/vfolder-rule.c
@@ -39,6 +39,7 @@
 #define d(x) x
 
 static gint validate(FilterRule *);
+static int vfolder_eq(FilterRule *fr, FilterRule *cm);
 static xmlNodePtr xml_encode(FilterRule *);
 static int xml_decode(FilterRule *, xmlNodePtr, struct _RuleContext *f);
 static void rule_copy (FilterRule *dest, FilterRule *src);
@@ -93,6 +94,7 @@ vfolder_rule_class_init (VfolderRuleClass *class)
 
 	/* override methods */
 	filter_rule->validate   = validate;
+	filter_rule->eq = vfolder_eq;
 	filter_rule->xml_encode = xml_encode;
 	filter_rule->xml_decode = xml_decode;
 	filter_rule->copy = rule_copy;
@@ -222,6 +224,29 @@ validate (FilterRule *fr)
 	return 1;
 }
 
+static int
+list_eq(GList *al, GList *bl)
+{
+	int truth = TRUE;
+
+	while (truth && al && bl) {
+		char *a = al->data, *b = bl->data;
+
+		truth = strcmp(a, b) == 0;
+		al = al->next;
+		bl = bl->next;
+	}
+
+	return truth && al == NULL && bl == NULL;
+}
+
+static int
+vfolder_eq(FilterRule *fr, FilterRule *cm)
+{
+        return ((FilterRuleClass *)(parent_class))->eq(fr, cm)
+		&& list_eq(((VfolderRule *)fr)->sources, ((VfolderRule *)cm)->sources);
+}
+
 static xmlNodePtr
 xml_encode (FilterRule *fr)
 {