From 0d719990521adf12e458fb193c679b8378aa3a55 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Wed, 7 Mar 2001 15:28:33 +0000 Subject: Return the return value of camel_service_connect rather than returning * camel-remote-store.c (camel_remote_store_connected): Return the return value of camel_service_connect rather than returning !camel_exception_is_set(), since that will be wrong if ex==NULL... Fixes a crash in the IMAP keepalive code, but this same problem probably exists in other places too... svn path=/trunk/; revision=8580 --- camel/ChangeLog | 8 ++++++++ camel/camel-remote-store.c | 6 ++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/camel/ChangeLog b/camel/ChangeLog index 5cdf92a664..14480ff486 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,11 @@ +2001-03-07 Dan Winship + + * camel-remote-store.c (camel_remote_store_connected): Return the + return value of camel_service_connect rather than returning + !camel_exception_is_set(), since that will be wrong if ex==NULL... + Fixes a crash in the IMAP keepalive code, but this same problem + probably exists in other places too... + 2001-03-06 Jeffrey Stedfast * camel-sasl-digest-md5.c (compute_response): Redone so as to save diff --git a/camel/camel-remote-store.c b/camel/camel-remote-store.c index 41e16a27fc..991e5b0e1a 100644 --- a/camel/camel-remote-store.c +++ b/camel/camel-remote-store.c @@ -635,9 +635,7 @@ camel_remote_store_refresh_folders (CamelRemoteStore *store, CamelException *ex) gboolean camel_remote_store_connected (CamelRemoteStore *store, CamelException *ex) { - if (store->istream == NULL) { - camel_service_connect (CAMEL_SERVICE (store), ex); - return !camel_exception_is_set (ex); - } + if (store->istream == NULL) + return camel_service_connect (CAMEL_SERVICE (store), ex); return TRUE; } -- cgit v1.2.3