From f146a1feb59ccb1a35ff748051b3c0127da72f61 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Tue, 8 Apr 2003 17:48:12 +0000 Subject: If store->engine->line is NULL, use _("Unknown error") as the error string 2003-04-08 Jeffrey Stedfast * providers/pop3/camel-pop3-store.c (pop3_try_authenticate): If store->engine->line is NULL, use _("Unknown error") as the error string instead. svn path=/trunk/; revision=20765 --- camel/ChangeLog | 6 ++++++ camel/providers/pop3/camel-pop3-store.c | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/camel/ChangeLog b/camel/ChangeLog index 7305a450a3..12aac0ffc9 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,9 @@ +2003-04-08 Jeffrey Stedfast + + * providers/pop3/camel-pop3-store.c (pop3_try_authenticate): If + store->engine->line is NULL, use _("Unknown error") as the error + string instead. + 2003-04-08 Not Zed * camel-folder-summary.c (camel_folder_summary_load): use diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c index a8c693b168..be4469f3eb 100644 --- a/camel/providers/pop3/camel-pop3-store.c +++ b/camel/providers/pop3/camel-pop3-store.c @@ -522,10 +522,12 @@ pop3_try_authenticate (CamelService *service, gboolean reprompt, const char *err errno ? g_strerror (errno) : _("Unknown error")); } } else if (pcp->state != CAMEL_POP3_COMMAND_OK) - camel_exception_setv(ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE, - _("Unable to connect to POP server %s.\nError sending password: %s"), - CAMEL_SERVICE(store)->url->host, store->engine->line); - + camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE, + _("Unable to connect to POP server %s.\n" + "Error sending password: %s"), + CAMEL_SERVICE (store)->url->host, + store->engine->line ? store->engine->line : _("Unknown error")); + camel_pop3_engine_command_free(store->engine, pcp); if (pcu) -- cgit v1.2.3