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.

diff --git a/camel/ChangeLog b/camel/ChangeLog
index aa2ed7d..c4c1bf5 100644 (file)
--- 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 cbfbb23..927c741 100644 (file)
--- 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))  {