aboutsummaryrefslogtreecommitdiffstats
path: root/mail/e-mail-session.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-05-03 06:37:28 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:42:05 +0800
commit55941bbced02d6bab3d7a7bb0fdbc301a4a6e6c6 (patch)
treeadd437450337f16682904998a99243b935bcfbb7 /mail/e-mail-session.c
parent96ac55771668937f146b3525d35438f8a9e0da66 (diff)
downloadgsoc2013-evolution-55941bbced02d6bab3d7a7bb0fdbc301a4a6e6c6.tar
gsoc2013-evolution-55941bbced02d6bab3d7a7bb0fdbc301a4a6e6c6.tar.gz
gsoc2013-evolution-55941bbced02d6bab3d7a7bb0fdbc301a4a6e6c6.tar.bz2
gsoc2013-evolution-55941bbced02d6bab3d7a7bb0fdbc301a4a6e6c6.tar.lz
gsoc2013-evolution-55941bbced02d6bab3d7a7bb0fdbc301a4a6e6c6.tar.xz
gsoc2013-evolution-55941bbced02d6bab3d7a7bb0fdbc301a4a6e6c6.tar.zst
gsoc2013-evolution-55941bbced02d6bab3d7a7bb0fdbc301a4a6e6c6.zip
EMailSession: Fix popb4smtp authentication.
Forgot I had already made CamelSaslPOPB4SMTP expect a CamelSource UID from camel_session_get_password().
Diffstat (limited to 'mail/e-mail-session.c')
-rw-r--r--mail/e-mail-session.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c
index 1ceb98f9f0..fc85da56c9 100644
--- a/mail/e-mail-session.c
+++ b/mail/e-mail-session.c
@@ -614,12 +614,7 @@ mail_session_get_password (CamelSession *session,
if (!strcmp(item, "popb4smtp_uid")) {
/* not 100% mt safe, but should be ok */
- if (account != NULL)
- ret = g_strdup (account->source->url);
- else if (CAMEL_IS_SERVICE (service)) {
- CamelURL *url = camel_service_get_camel_url (service);
- ret = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);
- }
+ ret = g_strdup ((account != NULL) ? account->uid : uid);
} else {
gchar *key = mail_session_make_key (service, item);
EAccountService *config_service = NULL;