aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-05-04 03:24:36 +0800
committerMatthew Barnes <mbarnes@redhat.com>2011-05-04 03:24:36 +0800
commit1ce5e2fee4ddc4dc5238870a9907340fce53055d (patch)
treef3aec7022ada36c65b4c9ce8a2f1347c558f9bd3 /mail
parentb4d14fdbe518e1009fd67e590c8d90ff5dc58382 (diff)
downloadgsoc2013-evolution-1ce5e2fee4ddc4dc5238870a9907340fce53055d.tar
gsoc2013-evolution-1ce5e2fee4ddc4dc5238870a9907340fce53055d.tar.gz
gsoc2013-evolution-1ce5e2fee4ddc4dc5238870a9907340fce53055d.tar.bz2
gsoc2013-evolution-1ce5e2fee4ddc4dc5238870a9907340fce53055d.tar.lz
gsoc2013-evolution-1ce5e2fee4ddc4dc5238870a9907340fce53055d.tar.xz
gsoc2013-evolution-1ce5e2fee4ddc4dc5238870a9907340fce53055d.tar.zst
gsoc2013-evolution-1ce5e2fee4ddc4dc5238870a9907340fce53055d.zip
MessageList: Simplify the "Location" column.
Diffstat (limited to 'mail')
-rw-r--r--mail/message-list.c43
1 files changed, 18 insertions, 25 deletions
diff --git a/mail/message-list.c b/mail/message-list.c
index 99e83a28b6..19c7a79c44 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -1687,38 +1687,31 @@ ml_tree_value_at_ex (ETreeModel *etm,
case COL_LOCATION: {
/* Fixme : freeing memory stuff (mem leaks) */
CamelFolder *folder;
- CamelURL *curl;
+ CamelStore *store;
EAccount *account;
- gchar *location = NULL;
- const gchar *uri;
- gchar *euri;
+ const gchar *store_name;
+ const gchar *folder_name;
+ const gchar *uid;
- if (CAMEL_IS_VEE_FOLDER (message_list->folder)) {
- folder = camel_vee_folder_get_location ((CamelVeeFolder *)message_list->folder, (CamelVeeMessageInfo *)msg_info, NULL);
- } else {
- folder = message_list->folder;
- }
+ folder = message_list->folder;
- uri = camel_folder_get_uri (folder);
- euri = em_uri_from_camel (uri);
+ if (CAMEL_IS_VEE_FOLDER (folder))
+ folder = camel_vee_folder_get_location (
+ CAMEL_VEE_FOLDER (folder),
+ (CamelVeeMessageInfo *) msg_info, NULL);
- account = e_get_account_by_source_url (uri);
+ store = camel_folder_get_parent_store (folder);
+ folder_name = camel_folder_get_full_name (folder);
- if (account) {
- curl = camel_url_new (uri, NULL);
- location = g_strconcat (account->name, ":", curl->path, NULL);
- } else {
- /* Local account */
- euri = em_uri_from_camel (uri);
- curl = camel_url_new (euri, NULL);
- if (curl->host && !strcmp(curl->host, "local") && curl->user && !strcmp(curl->user, "local"))
- location = g_strconcat (_("On This Computer"), ":",curl->path, NULL);
- }
+ uid = camel_service_get_uid (CAMEL_SERVICE (store));
+ account = e_get_account_by_uid (uid);
- camel_url_free (curl);
- g_free (euri);
+ if (account != NULL)
+ store_name = account->name;
+ else
+ store_name = _("On This Computer");
- return location;
+ return g_strdup_printf ("%s : %s", store_name, folder_name);
}
case COL_MIXED_RECIPIENTS:
case COL_RECIPIENTS:{