aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog8
-rw-r--r--camel/camel-remote-store.c6
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 <danw@ximian.com>
+
+ * 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 <fejj@ximian.com>
* 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;
}