** 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, 3 insertions, 7 deletions

diff --git a/filter/filter-label.h b/filter/filter-label.h
index 384e0864aa..0e78b6d3c1 100644
--- a/filter/filter-label.h
+++ b/filter/filter-label.h
@@ -29,7 +29,7 @@ extern "C" {
 #pragma }
 #endif /* __cplusplus */
 
-#include "filter-element.h"
+#include "filter-int.h"
 
 #define FILTER_LABEL(obj)         GTK_CHECK_CAST (obj, filter_label_get_type (), FilterLabel)
 #define FILTER_LABEL_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, filter_label_get_type (), FilterLabelClass)
@@ -39,13 +39,11 @@ typedef struct _FilterLabel FilterLabel;
 typedef struct _FilterLabelClass FilterLabelClass;
 
 struct _FilterLabel {
-	FilterElement parent;
-	
-	int label;
+	FilterInt parent;
 };
 
 struct _FilterLabelClass {
-	FilterElementClass parent_class;
+	FilterIntClass parent_class;
 	
 	/* virtual methods */
 	
@@ -56,8 +54,6 @@ GtkType filter_label_get_type (void);
 
 FilterLabel *filter_label_new (void);
 
-void filter_label_set_label (FilterLabel *filter, int label);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */