aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--default_user/ChangeLog5
-rw-r--r--default_user/searches.xml32
2 files changed, 27 insertions, 10 deletions
diff --git a/default_user/ChangeLog b/default_user/ChangeLog
index 61c6c508f4..0c1bc8fa74 100644
--- a/default_user/ChangeLog
+++ b/default_user/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-31 Jeffrey Stedfast <fejj@ximian.com>
+
+ * searches.xml: Moved "Sender-contains" to the top of the list and
+ added a Recipient contains item. This fixes bugs #4888 and #5668.
+
2001-07-30 Jason Leach <jleach@ximian.com>
* Makefile.am (install-data-hook): Only try to make a
diff --git a/default_user/searches.xml b/default_user/searches.xml
index 2a05fb98db..6ff337bae5 100644
--- a/default_user/searches.xml
+++ b/default_user/searches.xml
@@ -2,23 +2,31 @@
<filteroptions>
<ruleset>
<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"/>
+ </part>
+ </partset>
+ <sources/>
+ </rule>
+
+ <rule grouping="any" source="demand">
<title>Body or subject contains</title>
<partset>
<part name="subject">
<value name="subject-type" type="option" value="contains"/>
- <value name="subject" type="string">
- <string>crap</string>
- </value>
+ <value name="subject" type="string"/>
</part>
<part name="body">
<value name="body-type" type="option" value="contains"/>
- <value name="word" type="string">
- <string>crap</string>
- </value>
+ <value name="word" type="string"/>
</part>
</partset>
<sources/>
</rule>
+
<rule grouping="any" source="demand">
<title>Body contains</title>
<partset>
@@ -29,6 +37,7 @@
</partset>
<sources/>
</rule>
+
<rule grouping="any" source="demand">
<title>Subject contains</title>
<partset>
@@ -39,6 +48,7 @@
</partset>
<sources/>
</rule>
+
<rule grouping="any" source="demand">
<title>Body does not contain</title>
<partset>
@@ -49,6 +59,7 @@
</partset>
<sources/>
</rule>
+
<rule grouping="any" source="demand">
<title>Subject does not contain</title>
<partset>
@@ -59,12 +70,13 @@
</partset>
<sources/>
</rule>
+
<rule grouping="any" source="demand">
- <title>Sender contains</title>
+ <title>Recipients contain</title>
<partset>
- <part name="sender">
- <value name="sender-type" type="option" value="contains"/>
- <value name="sender" type="string"/>
+ <part name="recipients">
+ <value name="recipient-type" type="option" value="contains"/>
+ <value name="recipient" type="string"/>
</part>
</partset>
<sources/>