Don't reuse the exception if it has already been set.

2001-09-13  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-filter-driver.c (camel_filter_driver_filter_folder): Don't
	reuse the exception if it has already been set.
	(camel_filter_driver_filter_message): Same here. Also use the new
	return value from camel_filter_search_match().

	* camel-filter-search.c (camel_filter_search_match): Return an
	integer (matched, no-match, or error).

svn path=/trunk/; revision=12819

1 files changed, 8 insertions, 2 deletions

diff --git a/camel/camel-filter-search.h b/camel/camel-filter-search.h
index 1482f70539..eb1ad2e47d 100644
--- a/camel/camel-filter-search.h
+++ b/camel/camel-filter-search.h
@@ -34,8 +34,14 @@ extern "C" {
 #include <camel/camel-mime-message.h>
 #include <camel/camel-folder-summary.h>
 
-gboolean camel_filter_search_match(CamelMimeMessage *message, CamelMessageInfo *info,
-				   const char *source, const char *expression, CamelException *ex); 
+enum {
+	CAMEL_SEARCH_ERROR    = -1,
+	CAMEL_SEARCH_NOMATCH  =  0,
+	CAMEL_SEARCH_MATCHED  =  1,
+};
+
+int camel_filter_search_match (CamelMimeMessage *message, CamelMessageInfo *info,
+			       const char *source, const char *expression, CamelException *ex); 
 
 #ifdef __cplusplus
 }