[evolution/wip/gsettings] EMailSession: Fix popb4smtp authentication.

[Rodrigo Moya <rodrigo src gnome org>]

commit 55941bbced02d6bab3d7a7bb0fdbc301a4a6e6c6
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon May 2 18:37:28 2011 -0400

    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 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c
index 1ceb98f..fc85da5 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;