summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author3 <NotZed@Ximian.com>2001-11-13 22:51:46 +0000
committerMichael Zucci <zucchi@src.gnome.org>2001-11-13 22:51:46 +0000
commitf683f26ab88ad57fc40f73b1a1835aa685f2201d (patch)
tree2353cf0455b133c72ff2a39ee7dd7618ac36aaac
parentf7f6c1b875d8bdd16a50d97ac844417456a2564d (diff)
downloadevolution-data-server-f683f26ab88ad57fc40f73b1a1835aa685f2201d.tar.gz
If we have no source string, then use undefined, which should alwaysEVOLUTION_0_99_2
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.
-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 964acf272..82eeb7e84 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 1ac0b4633..430f61434 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;
}