diff options
| -rw-r--r-- | filter/ChangeLog | 4 | ||||
| -rw-r--r-- | filter/vfoldertypes.xml | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog index 943b1736bd..bceed1c312 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,3 +1,7 @@ +2000-07-07 Dan Winship <danw@helixcode.com> + + * vfoldertypes.xml: sync this to filtertypes.xml (to/cc thing) + 2000-07-05 Dan Winship <danw@helixcode.com> * remove some non-error case debugging messages. diff --git a/filter/vfoldertypes.xml b/filter/vfoldertypes.xml index 13e2ebd96a..537cbf9331 100644 --- a/filter/vfoldertypes.xml +++ b/filter/vfoldertypes.xml @@ -10,15 +10,10 @@ <rule name="to-address"> <code> - (match-all (header-contains "To" ${recipient})) + (match-all (or (header-contains "To" ${recipient}) + (header-contains "Cc" ${recipient}))) </code> - <description lang="en">The To address matches <source type="address" name="recipient">recipients</source>.</description> -</rule> -<rule name="cc-address-other"> - <code> - (match-all (header-contains "CC" ${recipient})) - </code> - <description lang="en">The Cc address matches <source type="address" name="recipient">recipients</source>.</description> + <description lang="en">The To or Cc address matches <source type="address" name="recipient">recipients</source>.</description> </rule> <rule name="subject-contains"> @@ -27,6 +22,7 @@ </code> <description lang="en">The Subject contains <source type="folder" name="words">words</source>.</description> </rule> + <rule name="body-contains"> <code> (match-all (body-contains ${words})) |