From 2cced15a67c22b7a253316130ddc80463c4f5151 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@ximian.com>
Date: Mon, 29 Jul 2002 20:50:44 +0000
Subject: Reordered.

2002-07-29  Jeffrey Stedfast  <fejj@ximian.com>

	* searches.xml: Reordered.

svn path=/trunk/; revision=17635
---
 default_user/ChangeLog    |  4 +++
 default_user/searches.xml | 70 ++++++++++++++++++++++++-----------------------
 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/>
@@ -61,17 +57,6 @@
       <sources/>
     </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>
@@ -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>
-- 
cgit v1.2.3