From 140a2de7885a0e0e360125bfc1305da01eb68f6a Mon Sep 17 00:00:00 2001 From: Not Zed Date: Mon, 27 Sep 2004 05:30:11 +0000 Subject: ** See bug #63521. 2004-09-21 Not Zed ** See bug #63521. * camel-movemail.c (camel_movemail): don't clear exception on entry. * camel-folder-search.c (match_words_message): use local exception. * camel-operation.c (camel_operation_cancel_check): soak up all cancellation requests as soon as we get one. (camel_operation_uncancel): soak up all cancellation reqeusts when we uncancel. * camel-uid-cache.c (camel_uid_cache_save): open the file O_TRUNC rather than O_EXCL, otherwise a crash would mean this file never gets updated. (camel_uid_cache_save): block cancellation around writes otherwise we could be interupted from old cancellation. * providers/local/camel-local-folder.c (camel_local_folder_construct): don't clear exception here, just don't pass it to summary load. * providers/pop3/camel-pop3-store.c (pop3_connect): only clear the exception when we received one we handled. * camel-filter-driver.c (close_folder): if exception is already set, don't pass it to folder.sync(). * camel-lock.c (camel_lock_folder): don't clear the exception here, if it came in set its a programming error. * camel-filter-driver.c (camel_filter_driver_filter_message): if the exception is set after evaluating the expression, stop immediately. svn path=/trunk/; revision=27389 --- camel/camel-folder-search.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'camel/camel-folder-search.c') diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c index bb570b8e44..b7578ba887 100644 --- a/camel/camel-folder-search.c +++ b/camel/camel-folder-search.c @@ -1109,15 +1109,16 @@ match_words_message(CamelFolder *folder, const char *uid, struct _camel_search_w { guint32 mask; CamelMimeMessage *msg; + CamelException x = CAMEL_EXCEPTION_INITIALISER; int truth; - msg = camel_folder_get_message(folder, uid, ex); + msg = camel_folder_get_message(folder, uid, &x); if (msg) { mask = 0; truth = match_words_1message((CamelDataWrapper *)msg, words, &mask); camel_object_unref((CamelObject *)msg); } else { - camel_exception_clear(ex); + camel_exception_clear(&x); truth = FALSE; } -- cgit v1.2.3