aboutsummaryrefslogtreecommitdiffstats
path: root/camel/providers/pop3/camel-pop3-store.c
diff options
context:
space:
mode:
Diffstat (limited to 'camel/providers/pop3/camel-pop3-store.c')
-rw-r--r--camel/providers/pop3/camel-pop3-store.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index ebf55ccd10..4015cb6ea1 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -495,18 +495,18 @@ pop3_try_authenticate (CamelService *service, const char *errmsg,
return FALSE;
}
- while ((status = camel_pop3_engine_iterate(store->engine, pcp)) > 0)
+ while ((status = camel_pop3_engine_iterate (store->engine, pcp)) > 0)
;
- if (status != CAMEL_POP3_COMMAND_OK) {
- if (status == CAMEL_POP3_COMMAND_ERR)
- camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
- _("Unable to connect to POP server.\nError sending password: %s"),
- store->engine->line);
- else
+ if (pcp->state != CAMEL_POP3_COMMAND_OK) {
+ if (status == -1)
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
_("Unable to connect to POP server.\nError sending password: %s"),
errno ? g_strerror (errno) : _("Unknown error"));
+ else
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
+ _("Unable to connect to POP server.\nError sending password: %s"),
+ store->engine->line);
}
camel_pop3_engine_command_free(store->engine, pcp);