From 1d672197bd1bb90e26bd59948868440e6365344f Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Sat, 31 Jan 2004 21:07:58 +0000 Subject: Same as below. 2004-01-31 Jeffrey Stedfast * providers/pop3/camel-pop3-store.c (pop3_try_authenticate): Same as below. * providers/smtp/camel-smtp-transport.c (smtp_connect): Instead of using the form %s@%s in the password prompt, use %s on host %s, hopefully this will be less confusing to users who have usernames of the form user@vhost. svn path=/trunk/; revision=24558 --- camel/ChangeLog | 10 ++++++++++ camel/providers/pop3/camel-pop3-store.c | 6 +++--- camel/providers/smtp/camel-smtp-transport.c | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/camel/ChangeLog b/camel/ChangeLog index 0c85f68590..c39db8f9d6 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,13 @@ +2004-01-31 Jeffrey Stedfast + + * providers/pop3/camel-pop3-store.c (pop3_try_authenticate): Same + as below. + + * providers/smtp/camel-smtp-transport.c (smtp_connect): Instead of + using the form %s@%s in the password prompt, use %s on host %s, + hopefully this will be less confusing to users who have usernames + of the form user@vhost. + 2004-01-30 Rodney Dawes * providers/groupwise/camel-groupwise-provider.c: Fix spelling error in diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c index 02e58dd98c..dd0dc33fa3 100644 --- a/camel/providers/pop3/camel-pop3-store.c +++ b/camel/providers/pop3/camel-pop3-store.c @@ -475,11 +475,11 @@ pop3_try_authenticate (CamelService *service, gboolean reprompt, const char *err if (!service->url->passwd) { char *prompt; guint32 flags = CAMEL_SESSION_PASSWORD_SECRET; - + if (reprompt) flags |= CAMEL_SESSION_PASSWORD_REPROMPT; - - prompt = g_strdup_printf (_("%sPlease enter the POP password for %s@%s"), + + prompt = g_strdup_printf (_("%sPlease enter the POP password for %s on host %s"), errmsg ? errmsg : "", service->url->user, service->url->host); diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c index be5e1be9c0..c7a3a4ab69 100644 --- a/camel/providers/smtp/camel-smtp-transport.c +++ b/camel/providers/smtp/camel-smtp-transport.c @@ -511,7 +511,7 @@ smtp_connect (CamelService *service, CamelException *ex) if (!service->url->passwd) { char *prompt; - prompt = g_strdup_printf (_("%sPlease enter the SMTP password for %s@%s"), + prompt = g_strdup_printf (_("%sPlease enter the SMTP password for %s on host %s"), errbuf ? errbuf : "", service->url->user, service->url->host); -- cgit v1.2.3