From 85b2913a380c69f14ae0254ad23b10fabfb33667 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 24 Oct 2008 23:52:05 +0000 Subject: Merge revisions 36534:36684 from trunk. svn path=/branches/kill-bonobo/; revision=36685 --- mail/mail-session.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'mail/mail-session.c') diff --git a/mail/mail-session.c b/mail/mail-session.c index 1de1ecfe61..3e7befb08d 100644 --- a/mail/mail-session.c +++ b/mail/mail-session.c @@ -171,13 +171,15 @@ get_password (CamelSession *session, CamelService *service, const char *domain, char *ret = NULL; EAccount *account = NULL; - url = service ? camel_url_to_string (service->url, CAMEL_URL_HIDE_ALL & (~CAMEL_URL_HIDE_AUTH)) : NULL; + url = service?camel_url_to_string(service->url, CAMEL_URL_HIDE_ALL):NULL; if (!strcmp(item, "popb4smtp_uri")) { /* not 100% mt safe, but should be ok */ if (url && (account = mail_config_get_account_by_transport_url(url))) ret = g_strdup(account->source->url); + else + ret = g_strdup(url); } else { char *key = make_key(service, item); EAccountService *config_service = NULL; -- cgit v1.2.3