2009-09-14 [colin] 3.7.2cvs32

[claws.git] / src / matcher.h

diff --git a/src/matcher.h b/src/matcher.h
index 5e935f5513c9797d3a6130f2d5ae75ad49d5359a..c78edd6fcd7c468dcb4676208a4d1c5c23a441ca 100644 (file)
--- a/src/matcher.h
+++ b/src/matcher.h
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002 by the Sylpheed Claws Team and Hiroyuki Yamamoto
+ * Copyright (C) 2002 by the Claws Mail Team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifndef MATCHER_H
@@ -26,9 +26,8 @@
 #include "procmsg.h"
 
 /* constants generated by yacc */
-#if !defined(YYBISON) && !defined(MATCHER_ALL)
-#      include "matcher_parser_parse.h"
-#endif
+#include "matcher_parser_lex.h"
+#include "matcher_parser_parse.h"
 
 struct _MatcherProp {
        int matchtype;
@@ -39,6 +38,7 @@ struct _MatcherProp {
        regex_t *preg;
        int error;
        gboolean result;
+       gboolean done;
 };
 
 typedef struct _MatcherProp MatcherProp;
@@ -77,8 +77,13 @@ enum {
        MC_(REPLIED), MC_(NOT_REPLIED),
        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),
+       MC_(WATCH_THREAD), MC_(NOT_WATCH_THREAD),
        MC_(SUBJECT), MC_(NOT_SUBJECT),
        MC_(FROM), MC_(NOT_FROM),
        MC_(TO), MC_(NOT_TO),
@@ -93,11 +98,15 @@ enum {
        MC_(HEADERS_PART), MC_(NOT_HEADERS_PART),
        MC_(MESSAGE), MC_(NOT_MESSAGE),
        MC_(BODY_PART), MC_(NOT_BODY_PART),
-       MC_(EXECUTE), MC_(NOT_EXECUTE),
+       MC_(TEST), MC_(NOT_TEST),
        MC_(SCORE_EQUAL),
        MC_(SIZE_GREATER), 
        MC_(SIZE_SMALLER),
        MC_(SIZE_EQUAL),
+       MC_(FOUND_IN_ADDRESSBOOK),MC_(NOT_FOUND_IN_ADDRESSBOOK),
+       MC_(TAG),MC_(NOT_TAG),
+       MC_(TAGGED),MC_(NOT_TAGGED),
+
        /* match type */
        MT_(MATCHCASE),
        MT_(MATCH),
@@ -111,13 +120,26 @@ enum {
        MA_(DELETE),
        MA_(MARK),
        MA_(UNMARK),
+       MA_(LOCK),
+       MA_(UNLOCK),
        MA_(MARK_AS_READ),
        MA_(MARK_AS_UNREAD),
+       MA_(MARK_AS_SPAM),
+       MA_(MARK_AS_HAM),
        MA_(FORWARD),
        MA_(FORWARD_AS_ATTACHMENT),
        MA_(COLOR),
        MA_(REDIRECT),
-       MA_(DELETE_ON_SERVER),
+       MA_(CHANGE_SCORE),
+       MA_(SET_SCORE),
+       MA_(STOP),
+       MA_(HIDE),
+       MA_(IGNORE),
+       MA_(WATCH),
+       MA_(ADD_TO_ADDRESSBOOK),
+       MA_(SET_TAG),
+       MA_(UNSET_TAG),
+       MA_(CLEAR_TAGS),
        /* boolean operations */
        MB_(OR),
        MB_(AND)
@@ -131,19 +153,19 @@ MatcherProp *matcherprop_new              (gint            criteria,
                                         gint            matchtype, 
                                         const gchar    *expr,
                                         int             value);
-MatcherProp *matcherprop_unquote_new   (gint            criteria, 
+MatcherProp *matcherprop_new_create    (gint            criteria, 
                                         const gchar    *header,
                                         gint            matchtype, 
                                         const gchar    *expr,
-                                        int             value);
+                                        int             value);
 void matcherprop_free                  (MatcherProp *prop);
 
 MatcherProp *matcherprop_parse         (gchar  **str);
 
 MatcherProp *matcherprop_copy          (const MatcherProp *src);
 
-gboolean matcherprop_match             (const MatcherProp      *prop, 
-                                        const MsgInfo          *info);
+gboolean matcherprop_match             (MatcherProp    *prop, 
+                                        MsgInfo        *info);
 
 MatcherList * matcherlist_new          (GSList         *matchers, 
                                         gboolean       bool_and);
@@ -159,14 +181,14 @@ gint matcher_parse_number         (gchar          **str);
 gboolean matcher_parse_boolean_op      (gchar          **str);
 gchar *matcher_parse_regexp            (gchar          **str);
 gchar *matcher_parse_str               (gchar          **str);
-const gchar *matcher_escape_str                (const gchar    *str);
-gchar *matcher_unescape_str            (gchar          *str);
 gchar *matcherprop_to_string           (MatcherProp    *matcher);
-gchar *matcherlist_to_string           (MatcherList    *matchers);
-gchar *matching_build_command          (gchar          *cmd, 
+gchar *matcherlist_to_string           (const MatcherList      *matchers);
+gchar *matching_build_command          (const gchar    *cmd, 
                                         MsgInfo        *info);
 
 void prefs_matcher_read_config         (void);
 void prefs_matcher_write_config                (void);
 
+gchar * matcher_quote_str(const gchar * src);
+
 #endif