diff options
| author | Dan Winship <danw@src.gnome.org> | 2000-12-02 01:32:42 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2000-12-02 01:32:42 +0800 |
| commit | dfee15e65ac56a20ae8841ed8410ba8ee9a505ca (patch) | |
| tree | aa2e3153c43232557e5d6e04a4df89111bf25c9b /camel/providers/pop3 | |
| parent | 4008cef734d96607948f029dddf47f9311adfb8d (diff) | |
| download | gsoc2013-evolution-dfee15e65ac56a20ae8841ed8410ba8ee9a505ca.tar.gz gsoc2013-evolution-dfee15e65ac56a20ae8841ed8410ba8ee9a505ca.tar.zst gsoc2013-evolution-dfee15e65ac56a20ae8841ed8410ba8ee9a505ca.zip | |
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
Diffstat (limited to 'camel/providers/pop3')
| -rw-r--r-- | camel/providers/pop3/camel-pop3-store.c | 6 |
1 files changed, 4 insertions, 2 deletions
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; } |