From e8aa23866a44d1d93750f42a9c168bcd007eb7bb Mon Sep 17 00:00:00 2001 From: Peter Williams Date: Tue, 17 Jul 2001 21:22:20 +0000 Subject: Clean up some exception misusage. 2001-07-17 Peter Williams Clean up some exception misusage. * providers/imap/camel-imap-command.c (camel_imap_command): Use our own internal exception for sending the string and transfer it to @ex if anything goes wrong. (imap_read_response): Use our own internal exception for reading the untagged responses and blah blah blah. * camel-session.c (get_service): Use our own internal exception when constructing the service and transfer it to @ex if anything goes wrong. * camel-remote-store.c (remote_recv_line): Instead of having gboolean exception, use our own internal exception and copy it to @ex if anything goes wrong. * camel-store.c (store_sync): Create an internal exception because sync_folder() checks it for validity. Transfer it to @ex when done. * camel-exception.c (camel_exception_get_description): If @ex is NULL, complain - passing NULL exceptions to Camel is okay, but there should be no circumstances under which they're then examined. (camel_exception_get_id): Same here, (camel_exception_xfer): NULL-protect and warn if transferring from a NULL exception. svn path=/trunk/; revision=11177 --- camel/camel-session.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'camel/camel-session.c') diff --git a/camel/camel-session.c b/camel/camel-session.c index e21d6b7ef2..206553daf3 100644 --- a/camel/camel-session.c +++ b/camel/camel-session.c @@ -351,7 +351,7 @@ get_service (CamelSession *session, const char *url_string, CamelURL *url; CamelProvider *provider; CamelService *service; - + CamelException internal_ex; url = camel_url_new (url_string, ex); if (!url) return NULL; @@ -379,8 +379,10 @@ get_service (CamelSession *session, const char *url_string, } service = (CamelService *)camel_object_new (provider->object_types[type]); - camel_service_construct (service, session, provider, url, ex); - if (camel_exception_is_set (ex)) { + camel_exception_init (&internal_ex); + camel_service_construct (service, session, provider, url, &internal_ex); + if (camel_exception_is_set (&internal_ex)) { + camel_exception_xfer (ex, &internal_ex); camel_object_unref (CAMEL_OBJECT (service)); service = NULL; } else { -- cgit v1.2.3