aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2003-08-06 05:12:14 +0800
committerMichael Zucci <zucchi@src.gnome.org>2003-08-06 05:12:14 +0800
commit9c6056e60136cd86eaf58e364eae33bac3f7c6db (patch)
treeb541b3669a69d71f676cfc117dbcac2059e4134c
parent8c301288f1ecaa5161fc1b458154b3404e239441 (diff)
downloadgsoc2013-evolution-9c6056e60136cd86eaf58e364eae33bac3f7c6db.tar
gsoc2013-evolution-9c6056e60136cd86eaf58e364eae33bac3f7c6db.tar.gz
gsoc2013-evolution-9c6056e60136cd86eaf58e364eae33bac3f7c6db.tar.bz2
gsoc2013-evolution-9c6056e60136cd86eaf58e364eae33bac3f7c6db.tar.lz
gsoc2013-evolution-9c6056e60136cd86eaf58e364eae33bac3f7c6db.tar.xz
gsoc2013-evolution-9c6056e60136cd86eaf58e364eae33bac3f7c6db.tar.zst
gsoc2013-evolution-9c6056e60136cd86eaf58e364eae33bac3f7c6db.zip
** See bug #42636.
2003-08-05 Not Zed <NotZed@Ximian.com> ** See bug #42636. * vfoldertypes.xml: Fix some of the subject rules, they were missing matching ')'s. 2003-08-01 Not Zed <NotZed@Ximian.com> ** See bug #47208. * filter-code.c (build_code): wrap the expression in a match-all so boolean expressions work properly for folder searches. svn path=/trunk/; revision=22090
-rw-r--r--filter/ChangeLog14
-rw-r--r--filter/filter-code.c4
-rw-r--r--filter/vfoldertypes.xml6
3 files changed, 20 insertions, 4 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog
index 1ce89247e6..b5931a5726 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,17 @@
+2003-08-05 Not Zed <NotZed@Ximian.com>
+
+ ** See bug #42636.
+
+ * vfoldertypes.xml: Fix some of the subject rules, they were
+ missing matching ')'s.
+
+2003-08-01 Not Zed <NotZed@Ximian.com>
+
+ ** See bug #47208.
+
+ * filter-code.c (build_code): wrap the expression in a match-all
+ so boolean expressions work properly for folder searches.
+
2003-07-23 Dan Winship <danw@ximian.com>
* Makefile.am: Use EVO_MARSHAL_RULE
diff --git a/filter/filter-code.c b/filter/filter-code.c
index 11739a318d..7b308506cc 100644
--- a/filter/filter-code.c
+++ b/filter/filter-code.c
@@ -109,12 +109,14 @@ build_code (FilterElement *fe, GString *out, struct _FilterPart *ff)
{
GList *l;
FilterInput *fi = (FilterInput *)fe;
-
+
+ g_string_append(out, "(match-all ");
l = fi->values;
while (l) {
g_string_append(out, (char *)l->data);
l = g_list_next(l);
}
+ g_string_append(out, ")");
}
/* and we have no value */
diff --git a/filter/vfoldertypes.xml b/filter/vfoldertypes.xml
index daa873d184..e60c1780dc 100644
--- a/filter/vfoldertypes.xml
+++ b/filter/vfoldertypes.xml
@@ -139,7 +139,7 @@
<option value="is not">
<title>is not</title>
<code>
- (match-all (not (header-matches "Subject" ${subject}))
+ (match-all (not (header-matches "Subject" ${subject})))
</code>
</option>
<option value="starts with">
@@ -151,7 +151,7 @@
<option value="not starts with">
<title>does not start with</title>
<code>
- (match-all (not (header-starts-with "Subject" ${subject}))
+ (match-all (not (header-starts-with "Subject" ${subject})))
</code>
</option>
<option value="ends with">
@@ -163,7 +163,7 @@
<option value="not ends with">
<title>does not end with</title>
<code>
- (match-all (not (header-ends-with "Subject" ${subject}))
+ (match-all (not (header-ends-with "Subject" ${subject})))
</code>
</option>
</input>