From 569cdde1969873a46b8674223343c51342db8771 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Tue, 7 Feb 2012 18:42:39 +0100
Subject: Bug #391472 - Add ability to match headers by words

---
 mail/em-filter-i18n.h |  2 ++
 mail/filtertypes.xml  | 24 ++++++++++++++++++++++++
 mail/searchtypes.xml  | 24 ++++++++++++++++++++++++
 mail/vfoldertypes.xml | 24 ++++++++++++++++++++++++
 4 files changed, 74 insertions(+)

diff --git a/mail/em-filter-i18n.h b/mail/em-filter-i18n.h
index 4173b6656e..5acf5efd15 100644
--- a/mail/em-filter-i18n.h
+++ b/mail/em-filter-i18n.h
@@ -16,6 +16,7 @@ gchar *s = N_("Deleted");
 gchar *s = N_("does not contain");
 gchar *s = N_("does not end with");
 gchar *s = N_("does not exist");
+gchar *s = N_("does not have words");
 gchar *s = N_("does not return");
 gchar *s = N_("does not sound like");
 gchar *s = N_("does not start with");
@@ -27,6 +28,7 @@ gchar *s = N_("exists");
 gchar *s = N_("Expression");
 gchar *s = N_("Follow Up");
 gchar *s = N_("Forward to");
+gchar *s = N_("has words");
 gchar *s = N_("Important");
 gchar *s = N_("is");
 gchar *s = N_("is after");
diff --git a/mail/filtertypes.xml b/mail/filtertypes.xml
index 3e9bd08343..c655c32cb8 100644
--- a/mail/filtertypes.xml
+++ b/mail/filtertypes.xml
@@ -401,6 +401,18 @@
 	(match-all (not (header-contains "Subject" ${subject})))
      </code>
     </option>
+    <option value="has-words">
+     <title>has words</title>
+     <code>
+	(match-all (header-has-words "Subject" ${subject}))
+     </code>
+    </option>
+    <option value="not has-words">
+     <title>does not have words</title>
+     <code>
+	(match-all (not (header-has-words "Subject" ${subject})))
+     </code>
+    </option>
     <option value="is">
      <title>is</title>
      <code>
@@ -469,6 +481,18 @@
 	(match-all (not (header-contains ${header-field} ${word})))
      </code>
     </option>
+    <option value="has-words">
+     <title>has words</title>
+     <code>
+	(match-all (header-has-words ${header-field} ${word}))
+     </code>
+    </option>
+    <option value="not has-words">
+     <title>does not have words</title>
+     <code>
+	(match-all (not (header-has-words ${header-field} ${word})))
+     </code>
+    </option>
     <option value="is">
      <title>is</title>
      <code>
diff --git a/mail/searchtypes.xml b/mail/searchtypes.xml
index bac9794e63..c74f58cbf7 100644
--- a/mail/searchtypes.xml
+++ b/mail/searchtypes.xml
@@ -339,6 +339,18 @@
        (match-all (not (header-contains "Subject" ${subject})))
      </code>
     </option>
+    <option value="has-words">
+     <title>has words</title>
+     <code>
+	(match-all (header-has-words "Subject" ${subject}))
+     </code>
+    </option>
+    <option value="not has-words">
+     <title>does not have words</title>
+     <code>
+	(match-all (not (header-has-words "Subject" ${subject})))
+     </code>
+    </option>
     <option value="is">
      <title>is</title>
      <code>
@@ -395,6 +407,18 @@
        (match-all (not (header-contains ${header-field} ${word})))
      </code>
     </option>
+    <option value="has-words">
+     <title>has words</title>
+     <code>
+	(match-all (header-has-words ${header-field} ${word}))
+     </code>
+    </option>
+    <option value="not has-words">
+     <title>does not have words</title>
+     <code>
+	(match-all (not (header-has-words ${header-field} ${word})))
+     </code>
+    </option>
     <option value="is">
      <title>is</title>
      <code>
diff --git a/mail/vfoldertypes.xml b/mail/vfoldertypes.xml
index b2189c569a..59dc96227c 100644
--- a/mail/vfoldertypes.xml
+++ b/mail/vfoldertypes.xml
@@ -339,6 +339,18 @@
 	(match-all (not (header-contains "Subject" ${subject})))
      </code>
     </option>
+    <option value="has-words">
+     <title>has words</title>
+     <code>
+	(match-all (header-has-words "Subject" ${subject}))
+     </code>
+    </option>
+    <option value="not has-words">
+     <title>does not have words</title>
+     <code>
+	(match-all (not (header-has-words "Subject" ${subject})))
+     </code>
+    </option>
     <option value="is">
      <title>is</title>
      <code>
@@ -395,6 +407,18 @@
 	(match-all (not (header-contains ${header-field} ${word})))
      </code>
     </option>
+    <option value="has-words">
+     <title>has words</title>
+     <code>
+	(match-all (header-has-words ${header-field} ${word}))
+     </code>
+    </option>
+    <option value="not has-words">
+     <title>does not have words</title>
+     <code>
+	(match-all (not (header-has-words ${header-field} ${word})))
+     </code>
+    </option>
     <option value="is">
      <title>is</title>
      <code>
-- 
cgit v1.2.3