commit - 5f1254056795e24af9da3427c0cd45ccad31451e
commit + 0ff4587f0a234a51c6e99607620f466629b9faff
blob - c60676b5767cf49caf27c65a10038fad134095a0
blob + 556215aa201b46e30cdbacbf29632aba8d257c8f
--- src/folder.h
+++ src/folder.h
#include "proctypes.h"
#include "xml.h"
#include "prefs_account.h"
-#include "matchertypes.h"
struct _MsgCache;
blob - f11bc2e5f5c07583f5edf49b0596c3f262f2ab12
blob + d5e806ba4ae15bd5c12308db40a651ca856b5fbd
--- src/folder_item_prefs.c
+++ src/folder_item_prefs.c
#include "defs.h"
#include "folder.h"
-#include "matcher.h"
#include "utils.h"
#include "prefs_gtk.h"
#include "folder_item_prefs.h"
blob - c98c513c02404d752a479782b83d1157dd5b0809
blob + 6fb652376d23bb63a6a3bced902b228b32797a96
--- src/main.c
+++ src/main.c
#include "prefs_toolbar.h"
#include "mh_gtk.h"
#include "imap_gtk.h"
-#include "matcher.h"
#include "hooks.h"
#include "menu.h"
#include "passwordstore.h"
blob - 7afdd06718b1650570a0f38212dc569369e0fde2 (mode 644)
blob + /dev/null
--- src/matcher.h
+++ /dev/null
-/*
- * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2014 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * 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, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef MATCHER_H
-#define MATCHER_H
-
-#include <sys/types.h>
-#include <regex.h>
-#include <glib.h>
-#include "proctypes.h"
-#include "matchertypes.h"
-
-struct _MatcherProp {
- int matchtype;
- int criteria;
- gchar *header;
- gchar *expr;
- int value;
- int error;
- gboolean result;
- gboolean done;
- /* Allows recompiling expr each time */
- regex_t *preg;
- /* Allows casefolding expr each time */
- gchar *casefold_expr;
-};
-
-struct _MatcherList {
- GSList *matchers;
- gboolean bool_and;
-};
-
-
-/* map MATCHCRITERIA_ to yacc's MATCHER_ */
-#define MC_(name) \
- MATCHCRITERIA_ ## name = MATCHER_ ## name
-
-/* map MATCHTYPE_ to yacc's MATCHER_ */
-#define MT_(name) \
- MATCHTYPE_ ## name = MATCHER_ ## name
-
-/* map MATCHACTION_ to yacc's MATCHER_ */
-#define MA_(name) \
- MATCHACTION_ ## name = MATCHER_ ## name
-
-/* map MATCHBOOL_ to yacc's MATCHER_ */
-#define MB_(name) \
- MATCHERBOOL_ ## name = MATCHER_ ## name
-
-
-void matcher_init(void);
-void matcher_done(void);
-
-MatcherProp *matcherprop_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);
-
-MatcherList * matcherlist_new (GSList *matchers,
- gboolean bool_and);
-MatcherList * matcherlist_new_from_lines(gchar *lines,
- gboolean bool_and,
- gboolean case_sensitive);
-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 *matcherprop_to_string (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);
-
-gchar * matcher_quote_str(const gchar * src);
-
-#endif
blob - 46a049b1698f49d23d8dbdecdf8a55a105ad859e (mode 644)
blob + /dev/null
--- src/matchertypes.h
+++ /dev/null
-/*
- * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2012 the Claws Mail team
- *
- * 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * 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, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef MATCHERTYPES_H
-#define MATCHERTYPES_H
-
-struct _MatcherProp;
-typedef struct _MatcherProp MatcherProp;
-
-struct _MatcherList;
-typedef struct _MatcherList MatcherList;
-
-#endif
