cvs remove.

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

        * filter-score.[ch]: cvs remove.

        * filter-element.c: Remove reference to filter-score.h

        * vfoldertypes.xml: Fix label vfolder rule as below, also add
        score and size rules from filtertypes.xml.

        * filtertypes.xml (score): Use (cast-int (user-tag "score")) to
        get the value directly, rather than (get-score).
        (label): Use (user-tag "label") to get the value directly, rather
        than (get-label).  The label is now a string too.

        * filter-label.c (filter_label_get_type): Make filter-label
        inherit from filter-option.  Which makes more sense doesn't it
        ... surely.
        (validate): Removed, optionlists are self-validating.
        (xml_create): Initialise the list of options from our
        configuration database.  If it isn't working, ignore it and set it
        up anyway.
        (filter_label_init): Override the xml type.
        (filter_label_count):
        (filter_label_label):
        (filter_label_index): Some helper functions for external
        interfaces.  All of the mail config/etc should use this.

        * filter-option.c (free_option):
        (xml_create):
        (clone): Made the "value" type in glib memory rather than xml
        memory space.
        (filter_option_add): Utility function to add a new option to the
        list.
        (clone): Use above function to simplify code.
        (xml_create): Same here.
        (xml_encode): Allow subclasses to override the type.

svn path=/trunk/; revision=17472

1 files changed, 52 insertions, 2 deletions

diff --git a/filter/vfoldertypes.xml b/filter/vfoldertypes.xml
index 34353e46c6..daa873d184 100644
--- a/filter/vfoldertypes.xml
+++ b/filter/vfoldertypes.xml
@@ -260,19 +260,69 @@
    <option value="is">
     <title>is</title>
     <code>
-       (match-all (= (get-label) ${versus}))
+       (match-all (= (user-tag "label") ${versus}))
     </code>
    </option>
    <option value="is-not">
     <title>is not</title>
     <code>
-       (match-all (not (= (get-label) ${versus})))
+       (match-all (not (= (user-tag "label") ${versus})))
     </code>
    </option>
   </input>
   <input type="label" name="versus"/>
  </part>
 
+ <part name="score">
+  <title>Score</title>
+  <input type="optionlist" name="score-type">
+   <option value="is">
+    <title>is</title>
+    <code>
+       (match-all (= (cast-int (user-tag "score")) ${versus}))
+    </code>
+   </option>
+   <option value="is-not">
+    <title>is not</title>
+    <code>
+       (match-all (not (= (cast-int (user-tag "score")) ${versus})))
+    </code>
+   </option>
+   <option value="greater-than">
+    <title>is greater than</title>
+    <code>
+       (match-all (&gt; (cast-int (user-tag "score")) ${versus}))
+    </code>
+   </option>
+   <option value="less-than">
+    <title>is less than</title>
+    <code>
+       (match-all (&lt; (cast-int (user-tag "score")) ${versus}))
+    </code>
+   </option>
+  </input>
+  <input type="score" name="versus"/>
+ </part>
+
+ <part name="size">
+  <title>Size (kB)</title>
+  <input type="optionlist" name="size-type">
+   <option value="greater-than">
+    <title>is greater than</title>
+    <code>
+       (match-all (&gt; (get-size) ${versus}))
+    </code>
+   </option>
+   <option value="less-than">
+    <title>is less than</title>
+    <code>
+       (match-all (&lt; (get-size) ${versus}))
+    </code>
+   </option>
+  </input>
+  <input type="integer" name="versus"/>
+ </part>
+
  <part name="status">
   <title>Status</title>
   <input type="optionlist" name="match-type">