2009-09-14 [colin] 3.7.2cvs32

[claws.git] / src / matcher.h

diff --git a/src/matcher.h b/src/matcher.h
index 5b00a1acc85c797739e5edae8d9f190a54a14c24..c78edd6fcd7c468dcb4676208a4d1c5c23a441ca 100644 (file)
--- a/src/matcher.h
+++ b/src/matcher.h
@@ -26,10 +26,8 @@
 #include "procmsg.h"
 
 /* constants generated by yacc */
-#if !defined(YYBISON) && !defined(MATCHER_ALL)
-#       include "matcher_parser_lex.h"
-#      include "matcher_parser_parse.h"
-#endif
+#include "matcher_parser_lex.h"
+#include "matcher_parser_parse.h"
 
 struct _MatcherProp {
        int matchtype;
@@ -80,6 +78,8 @@ enum {
        MC_(FORWARDED), MC_(NOT_FORWARDED),
        MC_(LOCKED), MC_(NOT_LOCKED),
        MC_(SPAM),MC_(NOT_SPAM),
+       MC_(HAS_ATTACHMENT), MC_(HAS_NO_ATTACHMENT),
+       MC_(SIGNED), MC_(NOT_SIGNED),
        MC_(PARTIAL), MC_(NOT_PARTIAL),
        MC_(COLORLABEL), MC_(NOT_COLORLABEL),
        MC_(IGNORE_THREAD), MC_(NOT_IGNORE_THREAD),
@@ -153,6 +153,11 @@ MatcherProp *matcherprop_new               (gint            criteria,
                                         gint            matchtype, 
                                         const gchar    *expr,
                                         int             value);
+MatcherProp *matcherprop_new_create    (gint            criteria, 
+                                        const gchar    *header,
+                                        gint            matchtype, 
+                                        const gchar    *expr,
+                                        int             value);
 void matcherprop_free                  (MatcherProp *prop);
 
 MatcherProp *matcherprop_parse         (gchar  **str);