aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2001-08-08 03:57:53 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2001-08-08 03:57:53 +0800
commit38870d9d5df8689b12ac2ec5c7b01a6621518ca1 (patch)
tree5f6223cd2b7b750864ec172342704cec7dc60565
parenta039733f7047d870fa4e8fe9425f8b76b4e15d41 (diff)
downloadgsoc2013-evolution-38870d9d5df8689b12ac2ec5c7b01a6621518ca1.tar.gz
gsoc2013-evolution-38870d9d5df8689b12ac2ec5c7b01a6621518ca1.tar.zst
gsoc2013-evolution-38870d9d5df8689b12ac2ec5c7b01a6621518ca1.zip
Reverted my previous change, I fixed the filter code to handle this the
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. svn path=/trunk/; revision=11739
-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>