diff options
| -rw-r--r-- | mail/ChangeLog | 4 | ||||
| -rw-r--r-- | mail/searchtypes.xml | 63 |
2 files changed, 19 insertions, 48 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 6c8b387c6d..690b99c9be 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,7 @@ +2005-01-24 Not Zed <NotZed@Ximian.com> + + * searchtypes.xml: changed for 69122. + 2005-01-21 JP Rosevear <jpr@novell.com> Fixes #46404 diff --git a/mail/searchtypes.xml b/mail/searchtypes.xml index 412e5e5ba8..bf1678a3c2 100644 --- a/mail/searchtypes.xml +++ b/mail/searchtypes.xml @@ -429,30 +429,12 @@ <ruleset> <rule grouping="any" source="demand"> - <_title>Subject contains</_title> + <_title>Subject or Sender contains</_title> <partset> <part name="subject"> <value name="subject-type" type="option" value="contains"/> <value name="subject" type="string"/> </part> - </partset> - <sources/> - </rule> - - <rule grouping="any" source="demand"> - <_title>Subject does not contain</_title> - <partset> - <part name="subject"> - <value name="subject-type" type="option" value="not contains"/> - <value name="subject" type="string"/> - </part> - </partset> - <sources/> - </rule> - - <rule grouping="any" source="demand"> - <_title>Sender contains</_title> - <partset> <part name="sender"> <value name="sender-type" type="option" value="contains"/> <value name="sender" type="string"/> @@ -473,61 +455,46 @@ </rule> <rule grouping="any" source="demand"> - <_title>Body contains</_title> + <_title>Message contains</_title> <partset> + <part name="subject"> + <value name="subject-type" type="option" value="contains"/> + <value name="subject" type="string"/> + </part> <part name="body"> <value name="body-type" type="option" value="contains"/> <value name="word" type="string"/> </part> - </partset> - <sources/> - </rule> - - <rule grouping="any" source="demand"> - <_title>Body does not contain</_title> - <partset> - <part name="body"> - <value name="body-type" type="option" value="not contains"/> - <value name="word" type="string"/> + <part name="sender"> + <value name="sender-type" type="option" value="contains"/> + <value name="sender" type="string"/> + </part> + <part name="to"> + <value name="recipient-type" type="option" value="contains"/> + <value name="recipient" type="address"/> </part> </partset> <sources/> </rule> <rule grouping="any" source="demand"> - <_title>Body or subject contains</_title> + <_title>Subject contains</_title> <partset> <part name="subject"> <value name="subject-type" type="option" value="contains"/> <value name="subject" type="string"/> </part> - <part name="body"> - <value name="body-type" type="option" value="contains"/> - <value name="word" type="string"/> - </part> </partset> <sources/> </rule> <rule grouping="any" source="demand"> - <_title>Message contains</_title> + <_title>Sender contains</_title> <partset> - <part name="subject"> - <value name="subject-type" type="option" value="contains"/> - <value name="subject" type="string"/> - </part> - <part name="body"> - <value name="body-type" type="option" value="contains"/> - <value name="word" type="string"/> - </part> <part name="sender"> <value name="sender-type" type="option" value="contains"/> <value name="sender" type="string"/> </part> - <part name="to"> - <value name="recipient-type" type="option" value="contains"/> - <value name="recipient" type="address"/> - </part> </partset> <sources/> </rule> |