aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--filter/ChangeLog6
-rw-r--r--filter/filtertypes.xml27
2 files changed, 33 insertions, 0 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog
index f9f89fb953..3cd961554a 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,5 +1,11 @@
2001-08-07 Jeffrey Stedfast <fejj@ximian.com>
+ * filtertypes.xml: Reverted my previous change, I fixed the filter
+ code to handle this the way danw said to handle it in bug #5886
+ now.
+
+2001-08-07 Jeffrey Stedfast <fejj@ximian.com>
+
* filtertypes.xml: Removed the "is" and "is not" rules from the
xml file for address matching because users are easily confused.
diff --git a/filter/filtertypes.xml b/filter/filtertypes.xml
index 58252dabf9..bca26ca0b3 100644
--- a/filter/filtertypes.xml
+++ b/filter/filtertypes.xml
@@ -16,6 +16,18 @@
(match-all (not (header-contains "From" ${sender})))
</code>
</option>
+ <option value="is">
+ <title>is</title>
+ <code>
+ (match-all (header-matches "From" ${sender}))
+ </code>
+ </option>
+ <option value="is not">
+ <title>is not</title>
+ <code>
+ (match-all (not (header-matches "From" ${sender})))
+ </code>
+ </option>
<option value="starts with">
<title>starts with</title>
<code>
@@ -74,6 +86,21 @@
(header-contains "Cc" ${recipient}))))
</code>
</option>
+ <option value="is">
+ <title>is</title>
+ <code>
+ (match-all (or (header-matches "To" ${recipient})
+ (header-matches "Cc" ${recipient})))
+ </code>
+ </option>
+ <option value="is not">
+ <title>is not</title>
+ <code>
+ (match-all (not (or
+ (header-matches "To" ${recipient})
+ (header-matches "Cc" ${recipient}))))
+ </code>
+ </option>
<option value="starts with">
<title>starts with</title>
<code>