diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2011-05-03 19:51:45 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2011-05-03 21:42:06 +0800 |
commit | 7b32d2fb5a9576573ce47fb7d77624ede06bb6a8 (patch) | |
tree | 4169ef3f3d29b117a5ec9927c00b7b87ab174196 | |
parent | 554f2eacf773dac9e000dc4415209c70e06efbc3 (diff) | |
download | gsoc2013-evolution-7b32d2fb5a9576573ce47fb7d77624ede06bb6a8.tar.gz gsoc2013-evolution-7b32d2fb5a9576573ce47fb7d77624ede06bb6a8.tar.zst gsoc2013-evolution-7b32d2fb5a9576573ce47fb7d77624ede06bb6a8.zip |
em-utils.c: Simplify guess_account_from_folder().
-rw-r--r-- | 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 448dcf8320..676a0f69db 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 * |