aboutsummaryrefslogtreecommitdiffstats
path: root/mail/searchtypes.xml
diff options
context:
space:
mode:
Diffstat (limited to 'mail/searchtypes.xml')
-rw-r--r--mail/searchtypes.xml36
1 files changed, 5 insertions, 31 deletions
diff --git a/mail/searchtypes.xml b/mail/searchtypes.xml
index 63a52ca772..ba349993f7 100644
--- a/mail/searchtypes.xml
+++ b/mail/searchtypes.xml
@@ -329,7 +329,7 @@
</code>
</option>
</input>
- <input type="string" name="recipient"/>
+ <input type="address" name="recipient"/>
</part>
<part name="subject">
@@ -569,7 +569,7 @@
</option>
</input>
<input type="optionlist" name="versus">
- <dynamic func="e_util_labels_get_filter_options"/>
+ <dynamic func="e_mail_labels_get_filter_options"/>
</input>
</part>
@@ -764,29 +764,18 @@
</partset>
<ruleset>
+
<rule grouping="any" source="demand">
- <_title>Subject or Addresses 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>
+ </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>
- <part name="to">
- <value name="recipient-type" type="option" value="contains"/>
- <value name="recipient" type="address"/>
- </part>
- <part name="to">
- <value name="recipient-type" type="option" value="contains"/>
- <value name="recipient" type="address"/>
- </part>
</partset>
<sources/>
</rule>
@@ -807,21 +796,6 @@
</rule>
<rule grouping="any" source="demand">
- <_title>Subject or Sender contains</_title>
- <partset>
- <part name="subject">
- <value name="subject-type" type="option" value="contains"/>
- <value name="subject" type="string"/>
- </part>
- <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>Recipients contain</_title>
<partset>
<part name="to">