diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-08-18 09:21:22 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-09-14 20:08:51 +0800 |
| commit | 9b59286ea42a3db8b5d76f4e388b8691340b034c (patch) | |
| tree | eb333208a2d7e3cb8deb2f461fb90bbddbb10eb6 /mail/e-mail-session.c | |
| parent | 87e18345094a649f2d6940d1ebd12b79454d7a94 (diff) | |
| download | gsoc2013-evolution-9b59286ea42a3db8b5d76f4e388b8691340b034c.tar gsoc2013-evolution-9b59286ea42a3db8b5d76f4e388b8691340b034c.tar.gz gsoc2013-evolution-9b59286ea42a3db8b5d76f4e388b8691340b034c.tar.bz2 gsoc2013-evolution-9b59286ea42a3db8b5d76f4e388b8691340b034c.tar.lz gsoc2013-evolution-9b59286ea42a3db8b5d76f4e388b8691340b034c.tar.xz gsoc2013-evolution-9b59286ea42a3db8b5d76f4e388b8691340b034c.tar.zst gsoc2013-evolution-9b59286ea42a3db8b5d76f4e388b8691340b034c.zip | |
Use new CamelService:display-name property.
Simplify, simplify...
Diffstat (limited to 'mail/e-mail-session.c')
| -rw-r--r-- | mail/e-mail-session.c | 10 |
1 files changed, 6 insertions, 4 deletions
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")); |