aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog4
-rw-r--r--camel/camel-service.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 61ea104bea..bb7682491e 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,9 @@
2002-05-15 Jeffrey Stedfast <fejj@ximian.com>
+ * camel-service.c (service_setv): Only reconnect if we are already
+ connected, if we are in a disconnected state then no need to
+ reconnect.
+
* providers/imap/camel-imap-folder.c (get_content): If the
part_spec is an empty string for a leaft part, use "1" since we
don't actually want to get the raw message headers too.
diff --git a/camel/camel-service.c b/camel/camel-service.c
index c704852a7c..e8059e460f 100644
--- a/camel/camel-service.c
+++ b/camel/camel-service.c
@@ -213,7 +213,8 @@ service_setv (CamelObject *object, CamelException *ex, CamelArgV *args)
camel_argv_ignore (args, i);
}
- if (reconnect) {
+ /* FIXME: what if we are in the process of connecting? */
+ if (reconnect && service->status == CAMEL_SERVICE_CONNECTED) {
/* reconnect the service using the new URL */
if (camel_service_disconnect (service, TRUE, ex))
camel_service_connect (service, ex);