diff options
| author | Not Zed <NotZed@Ximian.com> | 2004-08-12 14:53:28 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2004-08-12 14:53:28 +0800 |
| commit | 5c8d34f45eff3ec9d20e218b6b047fb7717eb1ed (patch) | |
| tree | 9a263f72840c3314cc1c473c515a7438fcaaff77 | |
| parent | 8921c159aec6d987dd1f9bc371f1b2842103f081 (diff) | |
| download | gsoc2013-evolution-5c8d34f45eff3ec9d20e218b6b047fb7717eb1ed.tar gsoc2013-evolution-5c8d34f45eff3ec9d20e218b6b047fb7717eb1ed.tar.gz gsoc2013-evolution-5c8d34f45eff3ec9d20e218b6b047fb7717eb1ed.tar.bz2 gsoc2013-evolution-5c8d34f45eff3ec9d20e218b6b047fb7717eb1ed.tar.lz gsoc2013-evolution-5c8d34f45eff3ec9d20e218b6b047fb7717eb1ed.tar.xz gsoc2013-evolution-5c8d34f45eff3ec9d20e218b6b047fb7717eb1ed.tar.zst gsoc2013-evolution-5c8d34f45eff3ec9d20e218b6b047fb7717eb1ed.zip | |
fix for e_passwords api change, and handle reprompting as well.
2004-08-10 Not Zed <NotZed@Ximian.com>
* providers/groupwise/camel-gw-listener.c
(get_addressbook_names_from_server): fix for e_passwords api
change, and handle reprompting as well.
svn path=/trunk/; revision=26879
| -rw-r--r-- | camel/ChangeLog | 6 | ||||
| -rw-r--r-- | camel/providers/groupwise/camel-gw-listener.c | 6 | ||||
| -rw-r--r-- | plugins/groupwise-account-setup/camel-gw-listener.c | 6 |
3 files changed, 14 insertions, 4 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index aa2ed7dff6..c4c1bf546c 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,9 @@ +2004-08-10 Not Zed <NotZed@Ximian.com> + + * providers/groupwise/camel-gw-listener.c + (get_addressbook_names_from_server): fix for e_passwords api + change, and handle reprompting as well. + 2004-08-06 Jeffrey Stedfast <fejj@novell.com> * providers/imap4/camel-imap4-summary.c (untagged_fetch_all): Call diff --git a/camel/providers/groupwise/camel-gw-listener.c b/camel/providers/groupwise/camel-gw-listener.c index cbfbb233b6..927c7410f1 100644 --- a/camel/providers/groupwise/camel-gw-listener.c +++ b/camel/providers/groupwise/camel-gw-listener.c @@ -381,6 +381,7 @@ get_addressbook_names_from_server (char *source_url) char *uri; const char *use_ssl; const char *poa_address; + guint32 flags = E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET; url = camel_url_new (source_url, NULL); if (url == NULL) { @@ -406,8 +407,8 @@ get_addressbook_names_from_server (char *source_url) prompt = g_strdup_printf (_("%sEnter password for %s (user %s)"), failed_auth, poa_address, url->user); - password = e_passwords_ask_password (prompt, "Groupwise", key, prompt, TRUE, - E_PASSWORDS_REMEMBER_FOREVER, &remember, + password = e_passwords_ask_password (prompt, "Groupwise", key, prompt, + E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET, &remember, NULL); g_free (prompt); @@ -415,6 +416,7 @@ get_addressbook_names_from_server (char *source_url) break; cnc = e_gw_connection_new (uri, url->user, password); failed_auth = _("Failed to authenticate.\n"); + flags |= E_PASSWORDS_REPROMPT; } while (cnc == NULL); if (E_IS_GW_CONNECTION(cnc)) { diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c index cbfbb233b6..927c7410f1 100644 --- a/plugins/groupwise-account-setup/camel-gw-listener.c +++ b/plugins/groupwise-account-setup/camel-gw-listener.c @@ -381,6 +381,7 @@ get_addressbook_names_from_server (char *source_url) char *uri; const char *use_ssl; const char *poa_address; + guint32 flags = E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET; url = camel_url_new (source_url, NULL); if (url == NULL) { @@ -406,8 +407,8 @@ get_addressbook_names_from_server (char *source_url) prompt = g_strdup_printf (_("%sEnter password for %s (user %s)"), failed_auth, poa_address, url->user); - password = e_passwords_ask_password (prompt, "Groupwise", key, prompt, TRUE, - E_PASSWORDS_REMEMBER_FOREVER, &remember, + password = e_passwords_ask_password (prompt, "Groupwise", key, prompt, + E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET, &remember, NULL); g_free (prompt); @@ -415,6 +416,7 @@ get_addressbook_names_from_server (char *source_url) break; cnc = e_gw_connection_new (uri, url->user, password); failed_auth = _("Failed to authenticate.\n"); + flags |= E_PASSWORDS_REPROMPT; } while (cnc == NULL); if (E_IS_GW_CONNECTION(cnc)) { |