aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-session.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2008-10-25 07:52:05 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-10-25 07:52:05 +0800
commit85b2913a380c69f14ae0254ad23b10fabfb33667 (patch)
treec1cf143e37294dd9dd3667ebbe0a1d0c00b04b56 /mail/mail-session.c
parente7a31c5035a0afeed6c1675e30487c1e2bdc139f (diff)
downloadgsoc2013-evolution-85b2913a380c69f14ae0254ad23b10fabfb33667.tar.gz
gsoc2013-evolution-85b2913a380c69f14ae0254ad23b10fabfb33667.tar.zst
gsoc2013-evolution-85b2913a380c69f14ae0254ad23b10fabfb33667.zip
Merge revisions 36534:36684 from trunk.
svn path=/branches/kill-bonobo/; revision=36685
Diffstat (limited to 'mail/mail-session.c')
-rw-r--r--mail/mail-session.c4
1 files changed, 3 insertions, 1 deletions
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;