re-organize matcher part 7; more to come

[claws.git] / src / matcher.h

diff --git a/src/matcher.h b/src/matcher.h
index 722f28ded183730f4deeff874865a94f3760ef6d..aeb6cc3a6002ae14aaf0715052274c0d3d6a88e6 100644 (file)
--- a/src/matcher.h
+++ b/src/matcher.h
@@ -18,7 +18,6 @@
  */
 
 #ifndef MATCHER_H
-
 #define MATCHER_H
 
 #include <sys/types.h>
@@ -79,6 +78,7 @@ enum {
        MC_(FORWARDED), MC_(NOT_FORWARDED),
        MC_(LOCKED), MC_(NOT_LOCKED),
        MC_(COLORLABEL), MC_(NOT_COLORLABEL),
+       MC_(IGNORE_THREAD), MC_(NOT_IGNORE_THREAD),
        MC_(SUBJECT), MC_(NOT_SUBJECT),
        MC_(FROM), MC_(NOT_FROM),
        MC_(TO), MC_(NOT_TO),
@@ -123,43 +123,50 @@ enum {
        MB_(AND)
 };
 
-gchar * get_matchparser_tab_str(gint id);
-gint get_matchparser_tab_id(const gchar *str); 
-MatcherProp * matcherprop_new(gint criteria, gchar * header,
-                             gint matchtype, gchar * expr,
-                             int age);
-
-MatcherProp * matcherprop_unquote_new(gint criteria, gchar * header,
-    gint matchtype, gchar * expr,
-    int value);
-
-void matcherprop_free(MatcherProp * prop);
-MatcherProp * matcherprop_parse(gchar ** str);
-
-MatcherProp * matcherprop_copy(MatcherProp *src);
-
-gboolean matcherprop_match(MatcherProp * prop, MsgInfo * info);
-
-MatcherList * matcherlist_new(GSList * matchers, gboolean bool_and);
-void matcherlist_free(MatcherList * cond);
-MatcherList * matcherlist_parse(gchar ** str);
-
-gboolean matcherlist_match(MatcherList * cond, MsgInfo * info);
-
-gint matcher_parse_keyword(gchar ** str);
-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);
-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, MsgInfo * info);
-
-
-void prefs_matcher_read_config(void);
-void prefs_matcher_write_config(void);
-
+const gchar *get_matchparser_tab_str   (gint id);
+gint get_matchparser_tab_id            (const gchar *str); 
+
+MatcherProp *matcherprop_new           (gint            criteria, 
+                                        const gchar    *header,
+                                        gint            matchtype, 
+                                        const gchar    *expr,
+                                        int             value);
+MatcherProp *matcherprop_unquote_new   (gint            criteria, 
+                                        const gchar    *header,
+                                        gint            matchtype, 
+                                        const gchar    *expr,
+                                        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);
+
+MatcherList * matcherlist_new          (GSList         *matchers, 
+                                        gboolean       bool_and);
+void matcherlist_free                  (MatcherList    *cond);
+
+MatcherList *matcherlist_parse         (gchar          **str);
+
+gboolean matcherlist_match             (MatcherList    *cond, 
+                                        MsgInfo        *info);
+
+gint matcher_parse_keyword             (gchar          **str);
+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           (const MatcherProp      *matcher);
+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);
 
 #endif