diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-08-18 09:21:22 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-08-18 10:27:46 +0800 |
| commit | dd57574c0427b4571c1daac42b6ffa636a8c80c1 (patch) | |
| tree | cfd6429d8c551ac48405f304326320a99eef3dfa /mail/message-list.c | |
| parent | f20ec31e2069d4278cc7d5d4a96a334c9bbccb40 (diff) | |
| download | gsoc2013-evolution-dd57574c0427b4571c1daac42b6ffa636a8c80c1.tar gsoc2013-evolution-dd57574c0427b4571c1daac42b6ffa636a8c80c1.tar.gz gsoc2013-evolution-dd57574c0427b4571c1daac42b6ffa636a8c80c1.tar.bz2 gsoc2013-evolution-dd57574c0427b4571c1daac42b6ffa636a8c80c1.tar.lz gsoc2013-evolution-dd57574c0427b4571c1daac42b6ffa636a8c80c1.tar.xz gsoc2013-evolution-dd57574c0427b4571c1daac42b6ffa636a8c80c1.tar.zst gsoc2013-evolution-dd57574c0427b4571c1daac42b6ffa636a8c80c1.zip | |
Use new CamelService:display-name property.
Simplify, simplify...
Diffstat (limited to 'mail/message-list.c')
| -rw-r--r-- | mail/message-list.c | 14 |
1 files changed, 4 insertions, 10 deletions
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); } |