diff options
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/mail-session.c | 19 |
2 files changed, 19 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index a7d92febd6..2c0a895ffc 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2006-04-24 Srinivasa Ragavan <sragavan@novell.com> + + * mail-session.c: (get_password): Ask passphrase if the user is + supposed to enter the same. + 2006-04-22 Srinivasa Ragavan <sragavan@novell.com> * em-format-html-display.c: (efhd_attachment_button), diff --git a/mail/mail-session.c b/mail/mail-session.c index b132130616..6b4bdf610f 100644 --- a/mail/mail-session.c +++ b/mail/mail-session.c @@ -200,11 +200,17 @@ get_password (CamelSession *session, CamelService *service, const char *domain, remember = config_service?config_service->save_passwd:FALSE; - if (account) - title = g_strdup_printf (_("Enter Password for %s"), account->name); - else - title = g_strdup (_("Enter Password")); - + if (flags & CAMEL_SESSION_PASSPHRASE) { + if (account) + title = g_strdup_printf (_("Enter Passphrase for %s"), account->name); + else + title = g_strdup (_("Enter Passphrase")); + } else { + if (account) + title = g_strdup_printf (_("Enter Password for %s"), account->name); + else + title = g_strdup (_("Enter Password")); + } if ((flags & CAMEL_SESSION_PASSWORD_STATIC) != 0) eflags = E_PASSWORDS_REMEMBER_NEVER; else if (config_service == NULL) @@ -218,6 +224,9 @@ get_password (CamelSession *session, CamelService *service, const char *domain, if (flags & CAMEL_SESSION_PASSWORD_SECRET) eflags |= E_PASSWORDS_SECRET; + if (flags & CAMEL_SESSION_PASSPHRASE) + eflags |= E_PASSWORDS_PASSPHRASE; + /* HACK: breaks abstraction ... e_account_writable doesn't use the eaccount, it also uses the same writable key for source and transport */ |