e-passwords: Remove unused function parameters.

2 files changed, 24 insertions, 31 deletions

diff --git a/e-util/e-passwords.c b/e-util/e-passwords.c
index 1f2d3b2e89..89dc39ef5b 100644
--- a/e-util/e-passwords.c
+++ b/e-util/e-passwords.c
@@ -658,8 +658,7 @@ e_passwords_set_online (gint state)
  * Saves the password associated with @key to disk.
  **/
 void
-e_passwords_remember_password (const gchar *unused,
-                               const gchar *key)
+e_passwords_remember_password (const gchar *key)
 {
 	EPassMsg *msg;
 
@@ -679,8 +678,7 @@ e_passwords_remember_password (const gchar *unused,
  * Forgets the password associated with @key, in memory and on disk.
  **/
 void
-e_passwords_forget_password (const gchar *unused,
-                             const gchar *key)
+e_passwords_forget_password (const gchar *key)
 {
 	EPassMsg *msg;
 
@@ -701,8 +699,7 @@ e_passwords_forget_password (const gchar *unused,
  * must free the returned password.
  **/
 gchar *
-e_passwords_get_password (const gchar *unused,
-                          const gchar *key)
+e_passwords_get_password (const gchar *key)
 {
 	EPassMsg *msg;
 	gchar *passwd;
@@ -749,7 +746,6 @@ e_passwords_add_password (const gchar *key,
 /**
  * e_passwords_ask_password:
  * @title: title for the password dialog
- * @unused: this argument is no longer used
  * @key: key to store the password under
  * @prompt: prompt string
  * @remember_type: whether or not to offer to remember the password,
@@ -767,7 +763,6 @@ e_passwords_add_password (const gchar *key,
  **/
 gchar *
 e_passwords_ask_password (const gchar *title,
-                          const gchar *unused,
                           const gchar *key,
                           const gchar *prompt,
                           EPasswordsRememberType remember_type,
diff --git a/e-util/e-passwords.h b/e-util/e-passwords.h
index 2fa345839e..1c884bb62e 100644
--- a/e-util/e-passwords.h
+++ b/e-util/e-passwords.h
@@ -26,26 +26,13 @@
 
 #ifndef EDS_DISABLE_DEPRECATED
 
-#ifndef _E_PASSWORD_H_
-#define _E_PASSWORD_H_
+#ifndef E_PASSWORDS_H
+#define E_PASSWORDS_H
 
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
-/*
- * 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.
- */
-void e_passwords_init (void);
-
-void        e_passwords_set_online (gint state);
-void        e_passwords_remember_password (const gchar *unused, const gchar *key);
-void        e_passwords_add_password      (const gchar *key, const gchar *passwd);
-gchar       *e_passwords_get_password      (const gchar *unused, const gchar *key);
-void        e_passwords_forget_password   (const gchar *unused, const gchar *key);
-
 typedef enum {
 	E_PASSWORDS_REMEMBER_NEVER,
 	E_PASSWORDS_REMEMBER_SESSION,
@@ -60,16 +47,27 @@ typedef enum {
 	E_PASSWORDS_PASSPHRASE = 1<<12 /* We are asking a passphrase */
 } EPasswordsRememberType;
 
-gchar *      e_passwords_ask_password     (const gchar *title,
-					   const gchar *unused,
-					   const gchar *key,
-					   const gchar *prompt,
-					   EPasswordsRememberType remember_type,
-					   gboolean *remember,
-					   GtkWindow *parent);
+/*
+ * 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.
+ */
+void		e_passwords_init		(void);
+void		e_passwords_set_online		(gint state);
+void		e_passwords_remember_password	(const gchar *key);
+void		e_passwords_add_password	(const gchar *key,
+						 const gchar *passwd);
+gchar *		e_passwords_get_password	(const gchar *key);
+void		e_passwords_forget_password	(const gchar *key);
+gchar *		e_passwords_ask_password	(const gchar *title,
+						 const gchar *key,
+						 const gchar *prompt,
+						 EPasswordsRememberType remember_type,
+						 gboolean *remember,
+						 GtkWindow *parent);
 
 G_END_DECLS
 
-#endif /* _E_PASSWORD_H_ */
+#endif /* E_PASSWORDS_H */
 
 #endif /* EDS_DISABLE_DEPRECATED */