aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--default_user/ChangeLog4
-rw-r--r--default_user/searches.xml70
2 files changed, 40 insertions, 34 deletions
diff --git a/default_user/ChangeLog b/default_user/ChangeLog
index 74a8ee7353..667e3993c4 100644
--- a/default_user/ChangeLog
+++ b/default_user/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-29 Jeffrey Stedfast <fejj@ximian.com>
+
+ * searches.xml: Reordered.
+
2002-06-25 Aaron Weber <aaron@ximian.com>
* local/Inbox/mbox: Add example FAQ items in welcome email, as per
diff --git a/default_user/searches.xml b/default_user/searches.xml
index 6b08f8eda2..aedf87cbc6 100644
--- a/default_user/searches.xml
+++ b/default_user/searches.xml
@@ -1,24 +1,24 @@
<?xml version="1.0"?>
<filteroptions>
<ruleset>
+
<rule grouping="any" source="demand">
- <_title>Message 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>
- <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"/>
+ </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/>
@@ -36,15 +36,11 @@
</rule>
<rule grouping="any" source="demand">
- <_title>Body or subject contains</_title>
+ <_title>Recipients contain</_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 name="to">
+ <value name="recipient-type" type="option" value="contains"/>
+ <value name="recipient" type="address"/>
</part>
</partset>
<sources/>
@@ -62,17 +58,6 @@
</rule>
<rule grouping="any" source="demand">
- <_title>Subject 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>Body does not contain</_title>
<partset>
<part name="body">
@@ -84,19 +69,35 @@
</rule>
<rule grouping="any" source="demand">
- <_title>Subject does not contain</_title>
+ <_title>Body or subject contains</_title>
<partset>
<part name="subject">
- <value name="subject-type" type="option" value="not contains"/>
+ <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>Recipients contain</_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>
+ <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"/>
@@ -104,5 +105,6 @@
</partset>
<sources/>
</rule>
+
</ruleset>
</filteroptions>