2006-07-31 [wwp] 2.4.0cvs3

[claws.git] / src / matcher.h

diff --git a/src/matcher.h b/src/matcher.h
index 563189c18a909cfba07584c0cbbab5cb3a3a50a0..f0f407bf278e2ae4af7434b61648ca839029ba6b 100644 (file)
--- a/src/matcher.h
+++ b/src/matcher.h
@@ -40,6 +40,7 @@ struct _MatcherProp {
        regex_t *preg;
        int error;
        gboolean result;
+       gboolean done;
 };
 
 typedef struct _MatcherProp MatcherProp;
@@ -100,13 +101,12 @@ enum {
        MC_(SIZE_GREATER), 
        MC_(SIZE_SMALLER),
        MC_(SIZE_EQUAL),
+       MC_(FOUND_IN_ADDRESSBOOK),MC_(NOT_FOUND_IN_ADDRESSBOOK),
        /* match type */
        MT_(MATCHCASE),
        MT_(MATCH),
        MT_(REGEXPCASE),
        MT_(REGEXP),
-       MT_(ANY_IN_ADDRESSBOOK),
-       MT_(ALL_IN_ADDRESSBOOK),
        /* actions */
        MA_(SCORE),
        MA_(EXECUTE),
@@ -127,6 +127,7 @@ enum {
        MA_(SET_SCORE),
        MA_(STOP),
        MA_(HIDE),
+       MA_(IGNORE),
        /* boolean operations */
        MB_(OR),
        MB_(AND)