aboutsummaryrefslogtreecommitdiffstats
path: root/mail/em-composer-utils.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-08-18 09:21:22 +0800
committerMatthew Barnes <mbarnes@redhat.com>2011-08-18 10:27:46 +0800
commitdd57574c0427b4571c1daac42b6ffa636a8c80c1 (patch)
treecfd6429d8c551ac48405f304326320a99eef3dfa /mail/em-composer-utils.c
parentf20ec31e2069d4278cc7d5d4a96a334c9bbccb40 (diff)
downloadgsoc2013-evolution-dd57574c0427b4571c1daac42b6ffa636a8c80c1.tar.gz
gsoc2013-evolution-dd57574c0427b4571c1daac42b6ffa636a8c80c1.tar.zst
gsoc2013-evolution-dd57574c0427b4571c1daac42b6ffa636a8c80c1.zip
Use new CamelService:display-name property.
Simplify, simplify...
Diffstat (limited to 'mail/em-composer-utils.c')
-rw-r--r--mail/em-composer-utils.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 161eb5b613..afbf81ccfa 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -992,7 +992,7 @@ em_utils_compose_new_message_with_mailto (EShell *shell,
{
EMsgComposer *composer;
EComposerHeaderTable *table;
- EAccount *account = NULL;
+ CamelService *service = NULL;
g_return_val_if_fail (E_IS_SHELL (shell), NULL);
@@ -1008,15 +1008,17 @@ em_utils_compose_new_message_with_mailto (EShell *shell,
if (folder != NULL) {
CamelStore *store;
- const gchar *uid;
store = camel_folder_get_parent_store (folder);
- uid = camel_service_get_uid (CAMEL_SERVICE (store));
- account = e_get_account_by_uid (uid);
+ service = CAMEL_SERVICE (store);
}
- if (account != NULL)
- e_composer_header_table_set_account_name (table, account->name);
+ if (service != NULL) {
+ const gchar *display_name;
+
+ display_name = camel_service_get_display_name (service);
+ e_composer_header_table_set_account_name (table, display_name);
+ }
composer_set_no_change (composer);