From f1ca58d40a5a005aa5fa751959edbe4ec5f2d22f Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sun, 16 Dec 2012 16:08:03 -0500
Subject: e-passwords: Remove unused functions.

e_passwords_cancel()
e_passwords_clear_passwords()
e_passwords_forget_passwords()
e_passwords_shutdown()
---
 doc/reference/libeutil/libeutil-sections.txt |  4 --
 e-util/e-passwords.c                         | 91 ----------------------------
 e-util/e-passwords.h                         |  8 +--
 3 files changed, 1 insertion(+), 102 deletions(-)

diff --git a/doc/reference/libeutil/libeutil-sections.txt b/doc/reference/libeutil/libeutil-sections.txt
index 2c0ef0a813..05194a8452 100644
--- a/doc/reference/libeutil/libeutil-sections.txt
+++ b/doc/reference/libeutil/libeutil-sections.txt
@@ -2375,15 +2375,11 @@ EPanedPrivate
 <FILE>e-passwords</FILE>
 <TITLE>Password Utilities (Legacy)</TITLE>
 e_passwords_init
-e_passwords_shutdown
-e_passwords_cancel
 e_passwords_set_online
 e_passwords_remember_password
 e_passwords_add_password
 e_passwords_get_password
 e_passwords_forget_password
-e_passwords_forget_passwords
-e_passwords_clear_passwords
 EPasswordsRememberType
 e_passwords_ask_password
 </SECTION>
diff --git a/e-util/e-passwords.c b/e-util/e-passwords.c
index bf4cfc1e7f..1f2d3b2e89 100644
--- a/e-util/e-passwords.c
+++ b/e-util/e-passwords.c
@@ -210,23 +210,6 @@ ep_msg_send (EPassMsg *msg)
 
 /* the functions that actually do the work */
 
-static void
-ep_clear_passwords (EPassMsg *msg)
-{
-	GError *error = NULL;
-
-	/* Find all Evolution passwords and delete them. */
-	secret_password_clear_sync (
-		&e_passwords_schema, NULL, &error,
-		"application", "Evolution", NULL);
-
-	if (error != NULL)
-		g_propagate_error (&msg->error, error);
-
-	if (!msg->noreply)
-		e_flag_set (msg->done);
-}
-
 static void
 ep_remember_password (EPassMsg *msg)
 {
@@ -651,52 +634,6 @@ e_passwords_init (void)
 	G_UNLOCK (passwords);
 }
 
-/**
- * e_passwords_cancel:
- *
- * Cancel any outstanding password operations and close any dialogues
- * currently being shown.
- **/
-void
-e_passwords_cancel (void)
-{
-	EPassMsg *msg;
-
-	G_LOCK (passwords);
-	while ((msg = g_queue_pop_head (&message_queue)) != NULL)
-		e_flag_set (msg->done);
-	G_UNLOCK (passwords);
-
-	if (password_dialog)
-		gtk_dialog_response (password_dialog, GTK_RESPONSE_CANCEL);
-}
-
-/**
- * e_passwords_shutdown:
- *
- * Cleanup routine to call before exiting.
- **/
-void
-e_passwords_shutdown (void)
-{
-	EPassMsg *msg;
-
-	G_LOCK (passwords);
-
-	while ((msg = g_queue_pop_head (&message_queue)) != NULL)
-		e_flag_set (msg->done);
-
-	if (password_cache != NULL) {
-		g_hash_table_destroy (password_cache);
-		password_cache = NULL;
-	}
-
-	G_UNLOCK (passwords);
-
-	if (password_dialog != NULL)
-		gtk_dialog_response (password_dialog, GTK_RESPONSE_CANCEL);
-}
-
 /**
  * e_passwords_set_online:
  * @state:
@@ -714,34 +651,6 @@ e_passwords_set_online (gint state)
 	/* TODO: we could check that a request is open and close it, or maybe who cares */
 }
 
-/**
- * e_passwords_forget_passwords:
- *
- * Forgets all cached passwords, in memory and on disk.
- **/
-void
-e_passwords_forget_passwords (void)
-{
-	EPassMsg *msg = ep_msg_new (ep_clear_passwords);
-
-	ep_msg_send (msg);
-	ep_msg_free (msg);
-}
-
-/**
- * e_passwords_clear_passwords:
- *
- * Forgets all disk cached passwords for the component.
- **/
-void
-e_passwords_clear_passwords (const gchar *unused)
-{
-	EPassMsg *msg = ep_msg_new (ep_clear_passwords);
-
-	ep_msg_send (msg);
-	ep_msg_free (msg);
-}
-
 /**
  * e_passwords_remember_password:
  * @key: the key
diff --git a/e-util/e-passwords.h b/e-util/e-passwords.h
index 83a4a7eaec..2fa345839e 100644
--- a/e-util/e-passwords.h
+++ b/e-util/e-passwords.h
@@ -37,20 +37,14 @@ 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.
- *
- * 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_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);
-void        e_passwords_forget_passwords  (void);
-void        e_passwords_clear_passwords (const gchar *unused);
 
 typedef enum {
 	E_PASSWORDS_REMEMBER_NEVER,
-- 
cgit v1.2.3