aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2011-01-11 00:51:11 +0800
committerMilan Crha <mcrha@redhat.com>2011-01-11 00:51:11 +0800
commit06ba0287d7ccc395104f0dc77f71bd825d0558db (patch)
tree76f498d733d0a21823b5384216391c7ee08160cc
parent2bfc6d2b488a140c888e8bb5b215cf89b115cff0 (diff)
downloadgsoc2013-evolution-06ba0287d7ccc395104f0dc77f71bd825d0558db.tar
gsoc2013-evolution-06ba0287d7ccc395104f0dc77f71bd825d0558db.tar.gz
gsoc2013-evolution-06ba0287d7ccc395104f0dc77f71bd825d0558db.tar.bz2
gsoc2013-evolution-06ba0287d7ccc395104f0dc77f71bd825d0558db.tar.lz
gsoc2013-evolution-06ba0287d7ccc395104f0dc77f71bd825d0558db.tar.xz
gsoc2013-evolution-06ba0287d7ccc395104f0dc77f71bd825d0558db.tar.zst
gsoc2013-evolution-06ba0287d7ccc395104f0dc77f71bd825d0558db.zip
Bug #593020 - Do not check Bcc in "Sender or Recipients" condition
-rw-r--r--mail/searchtypes.xml24
-rw-r--r--mail/vfoldertypes.xml24
2 files changed, 16 insertions, 32 deletions
diff --git a/mail/searchtypes.xml b/mail/searchtypes.xml
index e7e82edce0..bac9794e63 100644
--- a/mail/searchtypes.xml
+++ b/mail/searchtypes.xml
@@ -257,8 +257,7 @@
<code>
(match-all (or (header-contains "From" ${recipient})
(header-contains "To" ${recipient})
- (header-contains "Cc" ${recipient})
- (header-contains "Bcc" ${recipient})))
+ (header-contains "Cc" ${recipient})))
</code>
</option>
<option value="not contains">
@@ -267,8 +266,7 @@
(match-all (not (or
(header-contains "From" ${recipient})
(header-contains "To" ${recipient})
- (header-contains "Cc" ${recipient})
- (header-contains "Bcc" ${recipient}))))
+ (header-contains "Cc" ${recipient}))))
</code>
</option>
<option value="is">
@@ -276,8 +274,7 @@
<code>
(match-all (or (header-matches "From" ${recipient})
(header-matches "To" ${recipient})
- (header-matches "Cc" ${recipient})
- (header-matches "Bcc" ${recipient})))
+ (header-matches "Cc" ${recipient})))
</code>
</option>
<option value="is not">
@@ -286,8 +283,7 @@
(match-all (not (or
(header-matches "From" ${recipient})
(header-matches "To" ${recipient})
- (header-matches "Cc" ${recipient})
- (header-matches "Bcc" ${recipient}))))
+ (header-matches "Cc" ${recipient}))))
</code>
</option>
<option value="starts with">
@@ -295,8 +291,7 @@
<code>
(match-all (or (header-starts-with "From" ${recipient})
(header-starts-with "To" ${recipient})
- (header-starts-with "Cc" ${recipient})
- (header-starts-with "Bcc" ${recipient})))
+ (header-starts-with "Cc" ${recipient})))
</code>
</option>
<option value="not starts with">
@@ -305,8 +300,7 @@
(match-all (not (or
(header-starts-with "From" ${recipient})
(header-starts-with "To" ${recipient})
- (header-starts-with "Cc" ${recipient})
- (header-starts-with "Bcc" ${recipient}))))
+ (header-starts-with "Cc" ${recipient}))))
</code>
</option>
<option value="ends with">
@@ -314,8 +308,7 @@
<code>
(match-all (or (header-ends-with "From" ${recipient})
(header-ends-with "To" ${recipient})
- (header-ends-with "Cc" ${recipient})
- (header-ends-with "Bcc" ${recipient})))
+ (header-ends-with "Cc" ${recipient})))
</code>
</option>
<option value="not ends with">
@@ -324,8 +317,7 @@
(match-all (not (or
(header-ends-with "From" ${recipient})
(header-ends-with "To" ${recipient})
- (header-ends-with "Cc" ${recipient})
- (header-ends-with "Bcc" ${recipient}))))
+ (header-ends-with "Cc" ${recipient}))))
</code>
</option>
</input>
diff --git a/mail/vfoldertypes.xml b/mail/vfoldertypes.xml
index 9fd117b67d..b2189c569a 100644
--- a/mail/vfoldertypes.xml
+++ b/mail/vfoldertypes.xml
@@ -257,8 +257,7 @@
<code>
(match-all (or (header-contains "From" ${recipient})
(header-contains "To" ${recipient})
- (header-contains "Cc" ${recipient})
- (header-contains "Bcc" ${recipient})))
+ (header-contains "Cc" ${recipient})))
</code>
</option>
<option value="not contains">
@@ -267,8 +266,7 @@
(match-all (not (or
(header-contains "From" ${recipient})
(header-contains "To" ${recipient})
- (header-contains "Cc" ${recipient})
- (header-contains "Bcc" ${recipient}))))
+ (header-contains "Cc" ${recipient}))))
</code>
</option>
<option value="is">
@@ -276,8 +274,7 @@
<code>
(match-all (or (header-matches "From" ${recipient})
(header-matches "To" ${recipient})
- (header-matches "Cc" ${recipient})
- (header-matches "Bcc" ${recipient})))
+ (header-matches "Cc" ${recipient})))
</code>
</option>
<option value="is not">
@@ -286,8 +283,7 @@
(match-all (not (or
(header-matches "From" ${recipient})
(header-matches "To" ${recipient})
- (header-matches "Cc" ${recipient})
- (header-matches "Bcc" ${recipient}))))
+ (header-matches "Cc" ${recipient}))))
</code>
</option>
<option value="starts with">
@@ -295,8 +291,7 @@
<code>
(match-all (or (header-starts-with "From" ${recipient})
(header-starts-with "To" ${recipient})
- (header-starts-with "Cc" ${recipient})
- (header-starts-with "Bcc" ${recipient})))
+ (header-starts-with "Cc" ${recipient})))
</code>
</option>
<option value="not starts with">
@@ -305,8 +300,7 @@
(match-all (not (or
(header-starts-with "From" ${recipient})
(header-starts-with "To" ${recipient})
- (header-starts-with "Cc" ${recipient})
- (header-starts-with "Bcc" ${recipient}))))
+ (header-starts-with "Cc" ${recipient}))))
</code>
</option>
<option value="ends with">
@@ -314,8 +308,7 @@
<code>
(match-all (or (header-ends-with "From" ${recipient})
(header-ends-with "To" ${recipient})
- (header-ends-with "Cc" ${recipient})
- (header-ends-with "Bcc" ${recipient})))
+ (header-ends-with "Cc" ${recipient})))
</code>
</option>
<option value="not ends with">
@@ -324,8 +317,7 @@
(match-all (not (or
(header-ends-with "From" ${recipient})
(header-ends-with "To" ${recipient})
- (header-ends-with "Cc" ${recipient})
- (header-ends-with "Bcc" ${recipient}))))
+ (header-ends-with "Cc" ${recipient}))))
</code>
</option>
</input>