aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2004-02-01 05:07:58 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2004-02-01 05:07:58 +0800
commit1d672197bd1bb90e26bd59948868440e6365344f (patch)
tree1df9b71bb19bb9d3405fbc6848ac6f51c1f46995
parentcf2a45676175f0d71e2b8d51a6cd5436f3222b1e (diff)
downloadgsoc2013-evolution-1d672197bd1bb90e26bd59948868440e6365344f.tar
gsoc2013-evolution-1d672197bd1bb90e26bd59948868440e6365344f.tar.gz
gsoc2013-evolution-1d672197bd1bb90e26bd59948868440e6365344f.tar.bz2
gsoc2013-evolution-1d672197bd1bb90e26bd59948868440e6365344f.tar.lz
gsoc2013-evolution-1d672197bd1bb90e26bd59948868440e6365344f.tar.xz
gsoc2013-evolution-1d672197bd1bb90e26bd59948868440e6365344f.tar.zst
gsoc2013-evolution-1d672197bd1bb90e26bd59948868440e6365344f.zip
Same as below.
2004-01-31 Jeffrey Stedfast <fejj@ximian.com> * 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
-rw-r--r--camel/ChangeLog10
-rw-r--r--camel/providers/pop3/camel-pop3-store.c6
-rw-r--r--camel/providers/smtp/camel-smtp-transport.c2
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 <fejj@ximian.com>
+
+ * 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 <dobey@ximian.com>
* 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);