diff options
| author | Not Zed <NotZed@Ximian.com> | 2004-01-20 13:33:12 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2004-01-20 13:33:12 +0800 |
| commit | c5c43717419bcf6a6a3a5d5958090631dc7a13c9 (patch) | |
| tree | 046170f46a9b68134ff08aa99c64c86113f18fde /camel/providers | |
| parent | b6e44f08f719efee9c6ed90813d03ddbf42e9121 (diff) | |
| download | gsoc2013-evolution-c5c43717419bcf6a6a3a5d5958090631dc7a13c9.tar gsoc2013-evolution-c5c43717419bcf6a6a3a5d5958090631dc7a13c9.tar.gz gsoc2013-evolution-c5c43717419bcf6a6a3a5d5958090631dc7a13c9.tar.bz2 gsoc2013-evolution-c5c43717419bcf6a6a3a5d5958090631dc7a13c9.tar.lz gsoc2013-evolution-c5c43717419bcf6a6a3a5d5958090631dc7a13c9.tar.xz gsoc2013-evolution-c5c43717419bcf6a6a3a5d5958090631dc7a13c9.tar.zst gsoc2013-evolution-c5c43717419bcf6a6a3a5d5958090631dc7a13c9.zip | |
** See bug #52817.
2004-01-20 Not Zed <NotZed@Ximian.com>
** See bug #52817.
* camel-session.c (camel_session_get_password): merged reprompt
and secret into a flags field, and add more options. Fixed all
callers.
svn path=/trunk/; revision=24323
Diffstat (limited to 'camel/providers')
| -rw-r--r-- | camel/providers/imap/camel-imap-store.c | 2 | ||||
| -rw-r--r-- | camel/providers/imapp/camel-imapp-store.c | 3 | ||||
| -rw-r--r-- | camel/providers/nntp/camel-nntp-store.c | 2 | ||||
| -rw-r--r-- | camel/providers/pop3/camel-pop3-store.c | 8 | ||||
| -rw-r--r-- | camel/providers/smtp/camel-smtp-transport.c | 2 |
5 files changed, 11 insertions, 6 deletions
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c index d8ff6e0ec7..15f4a5c530 100644 --- a/camel/providers/imap/camel-imap-store.c +++ b/camel/providers/imap/camel-imap-store.c @@ -1287,7 +1287,7 @@ imap_auth_loop (CamelService *service, CamelException *ex) service->url->user, service->url->host); service->url->passwd = - camel_session_get_password (session, prompt, FALSE, TRUE, + camel_session_get_password (session, prompt, CAMEL_SESSION_PASSWORD_SECRET, service, "password", ex); g_free (prompt); g_free (errbuf); diff --git a/camel/providers/imapp/camel-imapp-store.c b/camel/providers/imapp/camel-imapp-store.c index 9123102a03..ad52b8790e 100644 --- a/camel/providers/imapp/camel-imapp-store.c +++ b/camel/providers/imapp/camel-imapp-store.c @@ -351,7 +351,8 @@ store_get_pass(CamelIMAPPStore *store) ((CamelService *)store)->url->user, ((CamelService *)store)->url->host); ((CamelService *)store)->url->passwd = camel_session_get_password(camel_service_get_session((CamelService *)store), - prompt, FALSE, TRUE, (CamelService*)store, "password", &ex); + prompt, CAMEL_SESSION_PASSWORD_SECRET, + (CamelService*)store, "password", &ex); g_free (prompt); if (camel_exception_is_set(&ex)) camel_exception_throw_ex(&ex); diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c index fc067062ba..a439c4fd8a 100644 --- a/camel/providers/nntp/camel-nntp-store.c +++ b/camel/providers/nntp/camel-nntp-store.c @@ -1002,7 +1002,7 @@ camel_nntp_try_authenticate (CamelNNTPStore *store) camel_exception_init (&ex); service->url->passwd = - camel_session_get_password (session, prompt, FALSE, TRUE, + camel_session_get_password (session, prompt, CAMEL_SESSION_PASSWORD_SECRET, service, "password", &ex); camel_exception_clear (&ex); g_free (prompt); diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c index fbdae86833..02e58dd98c 100644 --- a/camel/providers/pop3/camel-pop3-store.c +++ b/camel/providers/pop3/camel-pop3-store.c @@ -474,13 +474,17 @@ pop3_try_authenticate (CamelService *service, gboolean reprompt, const char *err if (!service->url->passwd) { char *prompt; - + guint32 flags = CAMEL_SESSION_PASSWORD_SECRET; + + if (reprompt) + flags |= CAMEL_SESSION_PASSWORD_REPROMPT; + prompt = g_strdup_printf (_("%sPlease enter the POP password for %s@%s"), errmsg ? errmsg : "", service->url->user, service->url->host); service->url->passwd = camel_session_get_password (camel_service_get_session (service), - prompt, reprompt, TRUE, service, "password", ex); + prompt, flags, service, "password", ex); g_free (prompt); if (!service->url->passwd) return FALSE; diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c index 5bf5add2ee..be5e1be9c0 100644 --- a/camel/providers/smtp/camel-smtp-transport.c +++ b/camel/providers/smtp/camel-smtp-transport.c @@ -515,7 +515,7 @@ smtp_connect (CamelService *service, CamelException *ex) errbuf ? errbuf : "", service->url->user, service->url->host); - service->url->passwd = camel_session_get_password (session, prompt, FALSE, TRUE, + service->url->passwd = camel_session_get_password (session, prompt, CAMEL_SESSION_PASSWORD_SECRET, service, "password", ex); g_free (prompt); |