aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
author3 <NotZed@Ximian.com>2001-11-14 06:51:46 +0800
committerMichael Zucci <zucchi@src.gnome.org>2001-11-14 06:51:46 +0800
commit77b4c60a69f9ce442e3efffa416045305d9de764 (patch)
treed3616ed60d91ab64075d387630ae480bb4c6130e /camel
parent541cb80af5a1dd9f0005ab15827d79acb01e29fb (diff)
downloadgsoc2013-evolution-77b4c60a69f9ce442e3efffa416045305d9de764.tar.gz
gsoc2013-evolution-77b4c60a69f9ce442e3efffa416045305d9de764.tar.zst
gsoc2013-evolution-77b4c60a69f9ce442e3efffa416045305d9de764.zip
If we have no source string, then use undefined, which should always
2001-11-13 <NotZed@Ximian.com> * camel-filter-search.c (get_source): If we have no source string, then use undefined, which should always evaluate to FALSE. Fix for #15267. svn path=/trunk/; revision=14688
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog6
-rw-r--r--camel/camel-filter-search.c10
2 files changed, 13 insertions, 3 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 964acf2727..82eeb7e846 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-13 <NotZed@Ximian.com>
+
+ * camel-filter-search.c (get_source): If we have no source string,
+ then use undefined, which should always evaluate to FALSE. Fix
+ for #15267.
+
2001-11-12 Jeffrey Stedfast <fejj@ximian.com>
* camel-store.c (camel_store_get_folder): Added a
diff --git a/camel/camel-filter-search.c b/camel/camel-filter-search.c
index 1ac0b46331..430f614349 100644
--- a/camel/camel-filter-search.c
+++ b/camel/camel-filter-search.c
@@ -419,7 +419,6 @@ get_source (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessag
char *src = NULL;
char *tmp;
- r = e_sexp_result_new (f, ESEXP_RES_STRING);
if (fms->source) {
CamelURL *url;
@@ -439,8 +438,13 @@ get_source (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessag
if (tmp)
*tmp = '\0';
}
-
- r->value.string = src;
+
+ if (src) {
+ r = e_sexp_result_new (f, ESEXP_RES_STRING);
+ r->value.string = src;
+ } else {
+ r = e_sexp_result_new (f, ESEXP_RES_UNDEFINED);
+ }
return r;
}