From dd57574c0427b4571c1daac42b6ffa636a8c80c1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 17 Aug 2011 21:21:22 -0400 Subject: Use new CamelService:display-name property. Simplify, simplify... --- mail/message-list.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'mail/message-list.c') diff --git a/mail/message-list.c b/mail/message-list.c index 66432a930f..70922b8e05 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -1688,12 +1688,11 @@ ml_tree_value_at_ex (ETreeModel *etm, } case COL_LOCATION: { /* Fixme : freeing memory stuff (mem leaks) */ - CamelFolder *folder; CamelStore *store; - EAccount *account; + CamelFolder *folder; + CamelService *service; const gchar *store_name; const gchar *folder_name; - const gchar *uid; folder = message_list->folder; @@ -1705,13 +1704,8 @@ ml_tree_value_at_ex (ETreeModel *etm, store = camel_folder_get_parent_store (folder); folder_name = camel_folder_get_full_name (folder); - uid = camel_service_get_uid (CAMEL_SERVICE (store)); - account = e_get_account_by_uid (uid); - - if (account != NULL) - store_name = account->name; - else - store_name = _("On This Computer"); + service = CAMEL_SERVICE (store); + store_name = camel_service_get_display_name (service); return g_strdup_printf ("%s : %s", store_name, folder_name); } -- cgit v1.2.3