diff options
| author | Not Zed <NotZed@Ximian.com> | 2004-09-27 13:30:11 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2004-09-27 13:30:11 +0800 |
| commit | 140a2de7885a0e0e360125bfc1305da01eb68f6a (patch) | |
| tree | b94d83a96d614ad8c172095796f50d3feea8a523 /camel/providers | |
| parent | a03468d97f0aff1cdc2c4ef99e474d10e07df0c5 (diff) | |
| download | gsoc2013-evolution-140a2de7885a0e0e360125bfc1305da01eb68f6a.tar gsoc2013-evolution-140a2de7885a0e0e360125bfc1305da01eb68f6a.tar.gz gsoc2013-evolution-140a2de7885a0e0e360125bfc1305da01eb68f6a.tar.bz2 gsoc2013-evolution-140a2de7885a0e0e360125bfc1305da01eb68f6a.tar.lz gsoc2013-evolution-140a2de7885a0e0e360125bfc1305da01eb68f6a.tar.xz gsoc2013-evolution-140a2de7885a0e0e360125bfc1305da01eb68f6a.tar.zst gsoc2013-evolution-140a2de7885a0e0e360125bfc1305da01eb68f6a.zip | |
** See bug #63521.
2004-09-21 Not Zed <NotZed@Ximian.com>
** 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
Diffstat (limited to 'camel/providers')
| -rw-r--r-- | camel/providers/local/camel-local-folder.c | 4 | ||||
| -rw-r--r-- | camel/providers/pop3/camel-pop3-store.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c index 4f15336785..5900d48bea 100644 --- a/camel/providers/local/camel-local-folder.c +++ b/camel/providers/local/camel-local-folder.c @@ -301,8 +301,8 @@ camel_local_folder_construct(CamelLocalFolder *lf, CamelStore *parent_store, con } folder->summary = (CamelFolderSummary *)CLOCALF_CLASS(lf)->create_summary(lf->summary_path, lf->folder_path, lf->index); - if (camel_local_summary_load((CamelLocalSummary *)folder->summary, forceindex, ex) == -1) { - camel_exception_clear(ex); + if (camel_local_summary_load((CamelLocalSummary *)folder->summary, forceindex, NULL) == -1) { + /* ? */ } /*if (camel_local_summary_check((CamelLocalSummary *)folder->summary, lf->changes, ex) == -1) {*/ diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c index 4e5c2baace..6870aa1456 100644 --- a/camel/providers/pop3/camel-pop3-store.c +++ b/camel/providers/pop3/camel-pop3-store.c @@ -601,7 +601,6 @@ pop3_connect (CamelService *service, CamelException *ex) return FALSE; do { - camel_exception_clear (ex); status = pop3_try_authenticate (service, reprompt, errbuf, ex); g_free (errbuf); errbuf = NULL; @@ -612,6 +611,7 @@ pop3_connect (CamelService *service, CamelException *ex) g_free (service->url->passwd); service->url->passwd = NULL; reprompt = TRUE; + camel_exception_clear (ex); } } while (status != -1 && ex->id == CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE); |