From dfee15e65ac56a20ae8841ed8410ba8ee9a505ca Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Fri, 1 Dec 2000 17:32:42 +0000 Subject: Don't g_return_if_fail if the service is already disconnected. Just * camel-service.c (camel_service_disconnect): Don't g_return_if_fail if the service is already disconnected. Just return. * providers/pop3/camel-pop3-store.c (pop3_try_authenticate): Return FALSE (don't try again) if we get CAMEL_POP3_FAIL. (pop3_connect): If we don't succeed, disconnect. svn path=/trunk/; revision=6756 --- camel/providers/pop3/camel-pop3-store.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'camel/providers/pop3/camel-pop3-store.c') diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c index bdcf7996e3..2f23bf0bb2 100644 --- a/camel/providers/pop3/camel-pop3-store.c +++ b/camel/providers/pop3/camel-pop3-store.c @@ -449,7 +449,7 @@ pop3_try_authenticate (CamelService *service, gboolean kpop, } g_free (msg); - return camel_exception_is_set (ex); + return status == CAMEL_POP3_ERR; } static gboolean @@ -515,8 +515,10 @@ pop3_connect (CamelService *service, CamelException *ex) g_free (errbuf); } while (tryagain); - if (camel_exception_is_set (ex)) + if (camel_exception_is_set (ex)) { + camel_service_disconnect (service, TRUE, ex); return FALSE; + } return TRUE; } -- cgit v1.2.3