If store->engine->line is NULL, use _("Unknown error") as the error string

2003-04-08  Jeffrey Stedfast  <fejj@ximian.com>

	* providers/pop3/camel-pop3-store.c (pop3_try_authenticate): If
	store->engine->line is NULL, use _("Unknown error") as the error
	string instead.

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 7305a45..12aac0f 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-08  Jeffrey Stedfast  <fejj@ximian.com>
+
+       * 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  <NotZed@Ximian.com>
 
        * 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 a8c693b..be4469f 100644 (file)
--- 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)