** See bug #61840, and others.

2004-08-10  Not Zed  <NotZed@Ximian.com>

        ** See bug #61840, and others.

        * e-passwords.c: Lots of changes.  The api is now fully
        multi-thread safe, all calls are serialised internally, even
        recursive main-loop calls.  Small api changes to the
        ask_password call to add some new features required by the mailer
        and to clean up some of the names.
        (e_passwords_cancel): new procedure to cancel any outstanding
        password requests, for when we need to go uninteractive.

svn path=/trunk/; revision=26878

1 files changed, 20 insertions, 10 deletions

diff --git a/e-util/e-passwords.h b/e-util/e-passwords.h
index 7a2b2aa17f..d68cf6aa6c 100644
--- a/e-util/e-passwords.h
+++ b/e-util/e-passwords.h
@@ -28,28 +28,38 @@
 
 G_BEGIN_DECLS
 
-/* initialization is now implicit when you call any of the functions
-   below (except _shutdown.).  e_passwords_shutdown should be called
-   at exit time to synch the password on-disk storage, and to free up
-   in-memory storage. */
-void        e_passwords_shutdown          (void);
+/*
+  initialization is now implicit when you call any of the functions
+  below, although this is only correct if the functions are called
+  from the main thread.
+
+  e_passwords_shutdown should be called at exit time to synch the
+  password on-disk storage, and to free up in-memory storage. */
+void e_passwords_init (void);
 
+void        e_passwords_shutdown          (void);
+void	    e_passwords_cancel(void);
 void        e_passwords_remember_password (const char *component, const char *key);
 void        e_passwords_add_password      (const char *key, const char *passwd);
 char       *e_passwords_get_password      (const char *component, const char *key);
 void        e_passwords_forget_password   (const char *component, const char *key);
 void        e_passwords_forget_passwords  (void);
-void        e_passwords_clear_component_passwords (const char *component);
+void        e_passwords_clear_passwords (const char *component);
 
 typedef enum {
-	E_PASSWORDS_DO_NOT_REMEMBER,
-	E_PASSWORDS_REMEMBER_FOR_SESSION,
-	E_PASSWORDS_REMEMBER_FOREVER
+	E_PASSWORDS_REMEMBER_NEVER,
+	E_PASSWORDS_REMEMBER_SESSION,
+	E_PASSWORDS_REMEMBER_FOREVER,
+	E_PASSWORDS_REMEMBER_MASK = 0xf,
+
+	/* option bits */
+	E_PASSWORDS_SECRET = 1<<8,
+	E_PASSWORDS_REPROMPT = 1<<9,
 } EPasswordsRememberType;
 
 char *      e_passwords_ask_password      (const char *title, 
 					   const char*component_name, const char *key,
-					   const char *prompt, gboolean secret,
+					   const char *prompt,
 					   EPasswordsRememberType remember_type,
 					   gboolean *remember,
 					   GtkWindow *parent);