From 304a2c1c91bd21b362090a4368fb460bc697d9b0 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 6 Aug 2012 16:10:09 +0200
Subject: Bug #246530 - Rules editor lacks "Label is (not) 'None'"

---
 mail/filtertypes.xml  | 10 +++-------
 mail/searchtypes.xml  | 10 +++-------
 mail/vfoldertypes.xml |  8 ++------
 3 files changed, 8 insertions(+), 20 deletions(-)

(limited to 'mail')

diff --git a/mail/filtertypes.xml b/mail/filtertypes.xml
index c655c32cb8..02bea7fadd 100644
--- a/mail/filtertypes.xml
+++ b/mail/filtertypes.xml
@@ -648,15 +648,11 @@
   <input type="optionlist" name="label-type">
    <option value="is">
     <title>is</title>
-    <code>
-       (match-all (or (= (user-tag "label") ${versus}) (user-flag (+ "$Label" ${versus})) (user-flag ${versus})))
-    </code>
+    <code func="e_mail_labels_get_filter_code"/>
    </option>
    <option value="is-not">
     <title>is not</title>
-    <code>
-       (match-all (not (or (= (user-tag "label") ${versus}) (user-flag (+ "$Label" ${versus})) (user-flag ${versus}))))
-    </code>
+    <code func="e_mail_labels_get_filter_code"/>
    </option>
   </input>
   <input type="optionlist" name="versus">
@@ -947,7 +943,7 @@
   <title>Set Label</title>
   <code>(set-label ${label})</code>
   <input type="optionlist" name="label">
-     <dynamic func="e_mail_labels_get_filter_options"/>
+     <dynamic func="e_mail_labels_get_filter_options_without_none"/>
   </input>
  </part>
  <part name="colour">
diff --git a/mail/searchtypes.xml b/mail/searchtypes.xml
index 0173066aa2..bf933d8342 100644
--- a/mail/searchtypes.xml
+++ b/mail/searchtypes.xml
@@ -644,16 +644,12 @@
   <input type="optionlist" name="label-type">
    <option value="is">
     <title>is</title>
-    <code>
-       (match-all (or (= (user-tag "label") ${versus}) (user-flag (+ "$Label" ${versus})) (user-flag ${versus})))
-    </code>
+    <code func="e_mail_labels_get_filter_code"/>
    </option>
    <option value="is-not">
     <title>is not</title>
-    <code>
-       (match-all (not (or (= (user-tag "label") ${versus}) (user-flag (+ "$Label" ${versus})) (user-flag ${versus}))))
-    </code>
-   </option>
+    <code func="e_mail_labels_get_filter_code"/>
+    </option>
   </input>
   <input type="optionlist" name="versus">
      <dynamic func="e_mail_labels_get_filter_options"/>
diff --git a/mail/vfoldertypes.xml b/mail/vfoldertypes.xml
index 5f8bbd19a4..9195271c9c 100644
--- a/mail/vfoldertypes.xml
+++ b/mail/vfoldertypes.xml
@@ -640,15 +640,11 @@
   <input type="optionlist" name="label-type">
    <option value="is">
     <title>is</title>
-    <code>
-       (match-all (or (= (user-tag "label") ${versus}) (user-flag (+ "$Label" ${versus})) (user-flag ${versus})))
-    </code>
+    <code func="e_mail_labels_get_filter_code"/>
    </option>
    <option value="is-not">
     <title>is not</title>
-    <code>
-       (match-all (not (or (= (user-tag "label") ${versus}) (user-flag (+ "$Label" ${versus})) (user-flag ${versus}))))
-    </code>
+    <code func="e_mail_labels_get_filter_code"/>
    </option>
   </input>
   <input type="optionlist" name="versus">
-- 
cgit