From 9b59286ea42a3db8b5d76f4e388b8691340b034c 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/em-composer-utils.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'mail/em-composer-utils.c') 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); -- cgit