From 960a7c60019c102c2da5979702ba41c9fc6700de Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Fri, 16 Mar 2012 13:31:08 -0400
Subject: Revert "Include searching Bcc header while looking for recipients"

This reverts commit 015ede7bc8212f079c3d9e2f2304b14457dbcfd9.

We can't search Bcc headers until we store Bcc addresses in the summary
database, otherwise the entire message has to be downloaded in order to
examine that one header.

Including Bcc addresses in the summary database so we can include Bcc
headers in recipient searches would be a worthy goal for 3.6.

Reverting this for now since it's a regression of bug 593020.
---
 mail/searchtypes.xml | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/mail/searchtypes.xml b/mail/searchtypes.xml
index 6357bfdb06..c74f58cbf7 100644
--- a/mail/searchtypes.xml
+++ b/mail/searchtypes.xml
@@ -55,8 +55,7 @@
      <title>contains</title>
      <code>
        (match-all (or (header-contains "To" ${recipient})
-                   	(header-contains "Cc" ${recipient})
-   		   	(header-contains "Bcc" ${recipient})))
+                      (header-contains "Cc" ${recipient})))
      </code>
     </option>
     <option value="not contains">
@@ -64,16 +63,14 @@
      <code>
        (match-all (not (or
                           (header-contains "To" ${recipient})
-                   	 (header-contains "Cc" ${recipient})
-                         (header-contains "Bcc" ${recipient}))))
+                         (header-contains "Cc" ${recipient}))))
      </code>
     </option>
     <option value="is">
      <title>is</title>
      <code>
        (match-all (or (header-matches "To" ${recipient})
-                   	 (header-contains "Cc" ${recipient})
-                         (header-matches "Bcc" ${recipient})))
+                         (header-matches "Cc" ${recipient})))
      </code>
     </option>
     <option value="is not">
@@ -81,16 +78,14 @@
      <code>
        (match-all (not (or
                (header-matches "To" ${recipient})
-               (header-contains "Cc" ${recipient})
-              (header-matches "Bcc" ${recipient}))))
+              (header-matches "Cc" ${recipient}))))
      </code>
     </option>
     <option value="starts with">
      <title>starts with</title>
      <code>
         (match-all (or (header-starts-with "To" ${recipient})
-                	(header-contains "Cc" ${recipient})
-                         (header-starts-with "Bcc" ${recipient})))
+                         (header-starts-with "Cc" ${recipient})))
      </code>
     </option>
     <option value="not starts with">
@@ -98,16 +93,14 @@
      <code>
         (match-all (not (or
                (header-starts-with "To" ${recipient})
-               (header-contains "Cc" ${recipient})
-              (header-starts-with "Bcc" ${recipient}))))
+              (header-starts-with "Cc" ${recipient}))))
      </code>
     </option>
     <option value="ends with">
      <title>ends with</title>
      <code>
         (match-all (or (header-ends-with "To" ${recipient})
-                   	 (header-contains "Cc" ${recipient})
-                         (header-ends-with "Bcc" ${recipient})))
+                         (header-ends-with "Cc" ${recipient})))
      </code>
     </option>
     <option value="not ends with">
@@ -115,8 +108,7 @@
      <code>
         (match-all (not (or
                (header-ends-with "To" ${recipient})
-               (header-contains "Cc" ${recipient})
-              (header-ends-with "Bcc" ${recipient}))))
+              (header-ends-with "Cc" ${recipient}))))
      </code>
     </option>
    </input>
-- 
cgit