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/e-mail-session.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'mail/e-mail-session.c') diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c index 6c96eca4be..ffcbb57e58 100644 --- a/mail/e-mail-session.c +++ b/mail/e-mail-session.c @@ -819,10 +819,12 @@ mail_session_get_password (CamelSession *session, GError **error) { EAccount *account = NULL; + const gchar *display_name = NULL; const gchar *uid = NULL; gchar *ret = NULL; if (CAMEL_IS_SERVICE (service)) { + display_name = camel_service_get_display_name (service); uid = camel_service_get_uid (service); account = e_get_account_by_uid (uid); } @@ -856,18 +858,18 @@ mail_session_get_password (CamelSession *session, gchar *title; if (flags & CAMEL_SESSION_PASSPHRASE) { - if (account) + if (display_name != NULL) title = g_strdup_printf ( _("Enter Passphrase for %s"), - account->name); + display_name); else title = g_strdup ( _("Enter Passphrase")); } else { - if (account) + if (display_name != NULL) title = g_strdup_printf ( _("Enter Password for %s"), - account->name); + display_name); else title = g_strdup ( _("Enter Password")); -- cgit v1.2.3