From 668b95dfb0680701a7821ec8f39fcd319bcc0a64 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 2 May 2011 18:37:28 -0400 Subject: EMailSession: Fix popb4smtp authentication. Forgot I had already made CamelSaslPOPB4SMTP expect a CamelSource UID from camel_session_get_password(). --- mail/e-mail-session.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'mail') 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; -- cgit