[evolution/webkit] em-utils.c: Simplify guess_account_from_folder().

[Dan VrÃtil <dvratil src gnome org>]

commit bc721df1b353a39c02a69d682d894bd66e32b638
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue May 3 07:51:45 2011 -0400

    em-utils.c: Simplify guess_account_from_folder().

 mail/em-utils.c |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)
---
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 448dcf8..676a0f6 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -2218,21 +2218,13 @@ em_utils_url_unescape_amp (const gchar *url)
 static EAccount *
 guess_account_from_folder (CamelFolder *folder)
 {
-	CamelService *service;
-	CamelStore *parent_store;
-	EAccount *account;
-	CamelURL *url;
-	gchar *source_url;
-
-	parent_store = camel_folder_get_parent_store (folder);
-	service = CAMEL_SERVICE (parent_store);
+	CamelStore *store;
+	const gchar *uid;
 
-	url = camel_service_get_camel_url (service);
-	source_url = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);
-	account = e_get_account_by_source_url (source_url);
-	g_free (source_url);
+	store = camel_folder_get_parent_store (folder);
+	uid = camel_service_get_uid (CAMEL_SERVICE (store));
 
-	return account;
+	return e_get_account_by_uid (uid);
 }
 
 static EAccount *