From 929ac5c61d7b300155ad9e73cfd3159934764314 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Wed, 30 Apr 2008 09:59:18 +0000
Subject: ** Fix for bug #530245

2008-04-30  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #530245

	* searchtypes.xml: Let searches work with labels again.


svn path=/trunk/; revision=35456
---
 mail/ChangeLog       | 6 ++++++
 mail/searchtypes.xml | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 9c26cece04..220ad054de 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-30  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #530245
+
+	* searchtypes.xml: Let searches work with labels again.
+
 2008-04-30  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #467892
diff --git a/mail/searchtypes.xml b/mail/searchtypes.xml
index c39791843e..1f7dcfe44a 100644
--- a/mail/searchtypes.xml
+++ b/mail/searchtypes.xml
@@ -260,13 +260,13 @@
    <option value="is">
     <title>is</title>
     <code>
-       (match-all (= (user-tag "label") ${versus}))
+       (match-all (or (= (user-tag "label") ${versus}) (user-flag (+ "$Label" ${versus})) (user-flag ${versus})))
     </code>
    </option>
    <option value="is-not">
     <title>is not</title>
     <code>
-       (match-all (not (= (user-tag "label") ${versus})))
+       (match-all (not (or (= (user-tag "label") ${versus}) (user-flag (+ "$Label" ${versus})) (user-flag ${versus}))))
     </code>
    </option>
   </input>
-- 
cgit v1.2.3