diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-05-03 06:37:28 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-05-03 06:37:28 +0800 |
| commit | 668b95dfb0680701a7821ec8f39fcd319bcc0a64 (patch) | |
| tree | c7af9e14a4f492545655143d0ec45983c2fdd7b7 | |
| parent | 18d8b5f73dcef5d6f3c1fdd02d168cf90762bb75 (diff) | |
| download | gsoc2013-evolution-668b95dfb0680701a7821ec8f39fcd319bcc0a64.tar.gz gsoc2013-evolution-668b95dfb0680701a7821ec8f39fcd319bcc0a64.tar.zst gsoc2013-evolution-668b95dfb0680701a7821ec8f39fcd319bcc0a64.zip | |
EMailSession: Fix popb4smtp authentication.
Forgot I had already made CamelSaslPOPB4SMTP expect a CamelSource UID
from camel_session_get_password().
| -rw-r--r-- | mail/e-mail-session.c | 7 |
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; |