evolution r35457 - branches/gnome-2-22/mail

[mcrha svn gnome org]

Author: mcrha
Date: Wed Apr 30 09:59:30 2008
New Revision: 35457
URL: http://svn.gnome.org/viewvc/evolution?rev=35457&view=rev

Log:
2008-04-30  Milan Crha  <mcrha redhat com>

	** Fix for bug #530245

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



Modified:
   branches/gnome-2-22/mail/ChangeLog
   branches/gnome-2-22/mail/searchtypes.xml

Modified: branches/gnome-2-22/mail/searchtypes.xml
==============================================================================
--- branches/gnome-2-22/mail/searchtypes.xml	(original)
+++ branches/gnome-2-22/mail/searchtypes.xml	Wed Apr 30 09:59:30 2008
@@ -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>