GNOME.org
 

[evolution-data-server/account-mgmt: 36/43] Adapt e-client-utils.c to the new ESource API.

commit 520ab5ced4e6e7f32e5094df6d7d022371095da1
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed May 25 21:17:41 2011 -0400

    Adapt e-client-utils.c to the new ESource API.

 .../libedataserverui/libedataserverui-sections.txt |   11 -
 libedataserverui/e-client-utils.c                  |  590 +-------------------
 libedataserverui/e-client-utils.h                  |   21 -
 3 files changed, 4 insertions(+), 618 deletions(-)
---
diff --git a/docs/reference/libedataserverui/libedataserverui-sections.txt b/docs/reference/libedataserverui/libedataserverui-sections.txt
index 1889003..a60d096 100644
--- a/docs/reference/libedataserverui/libedataserverui-sections.txt
+++ b/docs/reference/libedataserverui/libedataserverui-sections.txt
@@ -130,20 +130,9 @@ e_cell_renderer_color_get_type
 <FILE>e-client-utils</FILE>
 <TITLE>EClient Utilities</TITLE>
 EClientSourceType
-EClientUtilsAuthenticateHandler
 e_client_utils_new
-e_client_utils_new_from_uri
-e_client_utils_new_system
-e_client_utils_new_default
-e_client_utils_set_default
-e_client_utils_set_default_source
-e_client_utils_get_sources
 e_client_utils_open_new
 e_client_utils_open_new_finish
-e_client_utils_authenticate_handler
-e_client_utils_forget_password
-e_credentials_authenticate_helper
-e_credentials_forget_password
 </SECTION>
 
 <SECTION>
diff --git a/libedataserverui/e-client-utils.c b/libedataserverui/e-client-utils.c
index 3784535..6583438 100644
--- a/libedataserverui/e-client-utils.c
+++ b/libedataserverui/e-client-utils.c
@@ -28,10 +28,12 @@
 #include <libsoup/soup.h>
 
 #include <libedataserver/e-client.h>
-#include "libedataserver/e-client-private.h"
+#include <libedataserver/e-source-authentication.h>
 #include <libebook/e-book-client.h>
 #include <libecal/e-cal-client.h>
 
+#include "libedataserver/e-client-private.h"
+
 #include "e-passwords.h"
 #include "e-client-utils.h"
 
@@ -73,232 +75,13 @@ e_client_utils_new (ESource *source,
 	return res;
 }
 
-/**
- * e_client_utils_new_from_uri:
- *
- * Proxy function for e_book_client_utils_new_from_uri() and e_cal_client_utils_new_from_uri().
- *
- * Since: 3.2
- **/
-EClient *
-e_client_utils_new_from_uri (const gchar *uri,
-                             EClientSourceType source_type,
-                             GError **error)
-{
-	EClient *res = NULL;
-
-	g_return_val_if_fail (uri != NULL, NULL);
-
-	switch (source_type) {
-	case E_CLIENT_SOURCE_TYPE_CONTACTS:
-		res = E_CLIENT (e_book_client_new_from_uri (uri, error));
-		break;
-	case E_CLIENT_SOURCE_TYPE_EVENTS:
-		res = E_CLIENT (e_cal_client_new_from_uri (uri, E_CAL_CLIENT_SOURCE_TYPE_EVENTS, error));
-		break;
-	case E_CLIENT_SOURCE_TYPE_MEMOS:
-		res = E_CLIENT (e_cal_client_new_from_uri (uri, E_CAL_CLIENT_SOURCE_TYPE_MEMOS, error));
-		break;
-	case E_CLIENT_SOURCE_TYPE_TASKS:
-		res = E_CLIENT (e_cal_client_new_from_uri (uri, E_CAL_CLIENT_SOURCE_TYPE_TASKS, error));
-		break;
-	default:
-		g_return_val_if_reached (NULL);
-		break;
-	}
-
-	return res;
-}
-
-/**
- * e_client_utils_new_system:
- *
- * Proxy function for e_book_client_utils_new_system() and e_cal_client_utils_new_system().
- *
- * Since: 3.2
- **/
-EClient *
-e_client_utils_new_system (EClientSourceType source_type,
-                           GError **error)
-{
-	EClient *res = NULL;
-
-	switch (source_type) {
-	case E_CLIENT_SOURCE_TYPE_CONTACTS:
-		res = E_CLIENT (e_book_client_new_system (error));
-		break;
-	case E_CLIENT_SOURCE_TYPE_EVENTS:
-		res = E_CLIENT (e_cal_client_new_system (E_CAL_CLIENT_SOURCE_TYPE_EVENTS, error));
-		break;
-	case E_CLIENT_SOURCE_TYPE_MEMOS:
-		res = E_CLIENT (e_cal_client_new_system (E_CAL_CLIENT_SOURCE_TYPE_MEMOS, error));
-		break;
-	case E_CLIENT_SOURCE_TYPE_TASKS:
-		res = E_CLIENT (e_cal_client_new_system (E_CAL_CLIENT_SOURCE_TYPE_TASKS, error));
-		break;
-	default:
-		g_return_val_if_reached (NULL);
-		break;
-	}
-
-	return res;
-}
-
-/**
- * e_client_utils_new_default:
- *
- * Proxy function for e_book_client_utils_new_default() and e_cal_client_utils_new_default().
- *
- * Since: 3.2
- **/
-EClient *
-e_client_utils_new_default (EClientSourceType source_type,
-                            GError **error)
-{
-	EClient *res = NULL;
-
-	switch (source_type) {
-	case E_CLIENT_SOURCE_TYPE_CONTACTS:
-		res = E_CLIENT (e_book_client_new_default (error));
-		break;
-	case E_CLIENT_SOURCE_TYPE_EVENTS:
-		res = E_CLIENT (e_cal_client_new_default (E_CAL_CLIENT_SOURCE_TYPE_EVENTS, error));
-		break;
-	case E_CLIENT_SOURCE_TYPE_MEMOS:
-		res = E_CLIENT (e_cal_client_new_default (E_CAL_CLIENT_SOURCE_TYPE_MEMOS, error));
-		break;
-	case E_CLIENT_SOURCE_TYPE_TASKS:
-		res = E_CLIENT (e_cal_client_new_default (E_CAL_CLIENT_SOURCE_TYPE_TASKS, error));
-		break;
-	default:
-		g_return_val_if_reached (NULL);
-		break;
-	}
-
-	return res;
-}
-
-/**
- * e_client_utils_set_default:
- *
- * Proxy function for e_book_client_utils_set_default() and e_book_client_utils_set_default().
- *
- * Since: 3.2
- **/
-gboolean
-e_client_utils_set_default (EClient *client,
-                            EClientSourceType source_type,
-                            GError **error)
-{
-	gboolean res = FALSE;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (E_IS_CLIENT (client), FALSE);
-
-	switch (source_type) {
-	case E_CLIENT_SOURCE_TYPE_CONTACTS:
-		g_return_val_if_fail (E_IS_BOOK_CLIENT (client), FALSE);
-		res = e_book_client_set_default (E_BOOK_CLIENT (client), error);
-		break;
-	case E_CLIENT_SOURCE_TYPE_EVENTS:
-	case E_CLIENT_SOURCE_TYPE_MEMOS:
-	case E_CLIENT_SOURCE_TYPE_TASKS:
-		g_return_val_if_fail (E_IS_CAL_CLIENT (client), FALSE);
-		res = e_cal_client_set_default (E_CAL_CLIENT (client), error);
-		break;
-	default:
-		g_return_val_if_reached (FALSE);
-		break;
-	}
-
-	return res;
-}
-
-/**
- * e_client_utils_set_default_source:
- *
- * Proxy function for e_book_client_utils_set_default_source() and e_cal_client_utils_set_default_source().
- *
- * Since: 3.2
- **/
-gboolean
-e_client_utils_set_default_source (ESource *source,
-                                   EClientSourceType source_type,
-                                   GError **error)
-{
-	gboolean res = FALSE;
-
-	g_return_val_if_fail (source != NULL, FALSE);
-	g_return_val_if_fail (E_IS_SOURCE (source), FALSE);
-
-	switch (source_type) {
-	case E_CLIENT_SOURCE_TYPE_CONTACTS:
-		res = e_book_client_set_default_source (source, error);
-		break;
-	case E_CLIENT_SOURCE_TYPE_EVENTS:
-		res = e_cal_client_set_default_source (source, E_CAL_CLIENT_SOURCE_TYPE_EVENTS, error);
-		break;
-	case E_CLIENT_SOURCE_TYPE_MEMOS:
-		res = e_cal_client_set_default_source (source, E_CAL_CLIENT_SOURCE_TYPE_MEMOS, error);
-		break;
-	case E_CLIENT_SOURCE_TYPE_TASKS:
-		res = e_cal_client_set_default_source (source, E_CAL_CLIENT_SOURCE_TYPE_TASKS, error);
-		break;
-	default:
-		g_return_val_if_reached (FALSE);
-		break;
-	}
-
-	return res;
-}
-
-/**
- * e_client_utils_get_sources:
- *
- * Proxy function for e_book_client_utils_get_sources() and e_cal_client_utils_get_sources().
- *
- * Since: 3.2
- **/
-gboolean
-e_client_utils_get_sources (ESourceList **sources,
-                            EClientSourceType source_type,
-                            GError **error)
-{
-	gboolean res = FALSE;
-
-	g_return_val_if_fail (sources != NULL, FALSE);
-
-	switch (source_type) {
-	case E_CLIENT_SOURCE_TYPE_CONTACTS:
-		res = e_book_client_get_sources (sources, error);
-		break;
-	case E_CLIENT_SOURCE_TYPE_EVENTS:
-		res = e_cal_client_get_sources (sources, E_CAL_CLIENT_SOURCE_TYPE_EVENTS, error);
-		break;
-	case E_CLIENT_SOURCE_TYPE_MEMOS:
-		res = e_cal_client_get_sources (sources, E_CAL_CLIENT_SOURCE_TYPE_MEMOS, error);
-		break;
-	case E_CLIENT_SOURCE_TYPE_TASKS:
-		res = e_cal_client_get_sources (sources, E_CAL_CLIENT_SOURCE_TYPE_TASKS, error);
-		break;
-	default:
-		g_return_val_if_reached (FALSE);
-		break;
-	}
-
-	return res;
-}
-
 typedef struct _EClientUtilsAsyncOpData
 {
-	EClientUtilsAuthenticateHandler auth_handler;
-	gpointer auth_handler_user_data;
 	GAsyncReadyCallback async_cb;
 	gpointer async_cb_user_data;
 	GCancellable *cancellable;
 	ESource *source;
 	EClient *client;
-	ECredentials *used_credentials;
 	gboolean open_finished;
 	GError *opened_cb_error;
 	guint retry_open_id;
@@ -319,8 +102,6 @@ free_client_utils_async_op_data (EClientUtilsAsyncOpData *async_data)
 	g_signal_handlers_disconnect_matched (async_data->cancellable, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, async_data);
 	g_signal_handlers_disconnect_matched (async_data->client, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, async_data);
 
-	if (async_data->used_credentials)
-		e_credentials_free (async_data->used_credentials);
 	if (async_data->opened_cb_error)
 		g_error_free (async_data->opened_cb_error);
 	g_object_unref (async_data->cancellable);
@@ -408,12 +189,6 @@ client_utils_get_backend_property_cb (GObject *source_object,
 			return;
 	}
 
-	/* keep the initial auth_handler connected directly, thus it will be able
-	 * to answer any later authentication requests, for reconnection, for example
-	*/
-	if (async_data->auth_handler)
-		g_signal_connect (async_data->client, "authenticate", G_CALLBACK (async_data->auth_handler), async_data->auth_handler_user_data);
-
 	simple = g_simple_async_result_new (G_OBJECT (async_data->source), async_data->async_cb, async_data->async_cb_user_data, e_client_utils_open_new);
 	g_simple_async_result_set_op_res_gpointer (simple, g_object_ref (async_data->client), g_object_unref);
 
@@ -486,21 +261,7 @@ finish_or_retry_open (EClientUtilsAsyncOpData *async_data,
 {
 	g_return_if_fail (async_data != NULL);
 
-	if (async_data->auth_handler && error && g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_AUTHENTICATION_FAILED)) {
-		if (async_data->used_credentials) {
-			const gchar *prompt_key;
-
-			prompt_key = e_credentials_peek (async_data->used_credentials, E_CREDENTIALS_KEY_PROMPT_KEY);
-
-			/* make sure the old password is forgotten when authentication failed */
-			if (prompt_key)
-				e_passwords_forget_password (NULL, prompt_key);
-
-			e_credentials_set (async_data->used_credentials, E_CREDENTIALS_KEY_PROMPT_REASON, error->message);
-		}
-
-		e_client_process_authentication (async_data->client, async_data->used_credentials);
-	} else if (error && g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_BUSY)) {
+	if (error && g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_BUSY)) {
 		/* postpone for 1/2 of a second, backend is busy now */
 		async_data->open_finished = FALSE;
 		async_data->retry_open_id = g_timeout_add (500, client_utils_retry_open_timeout_cb, async_data);
@@ -586,70 +347,12 @@ client_utils_retry_open_timeout_cb (gpointer user_data)
 	return FALSE;
 }
 
-static gboolean
-client_utils_open_new_auth_cb (EClient *client,
-                               ECredentials *credentials,
-                               gpointer user_data)
-{
-	EClientUtilsAsyncOpData *async_data = user_data;
-	gboolean handled;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (async_data != NULL, FALSE);
-	g_return_val_if_fail (async_data->auth_handler != NULL, FALSE);
-
-	if (async_data->cancellable && g_cancellable_is_cancelled (async_data->cancellable))
-		return FALSE;
-
-	if (async_data->used_credentials) {
-		const gchar *reason = e_credentials_peek (async_data->used_credentials, E_CREDENTIALS_KEY_PROMPT_REASON);
-
-		if (reason) {
-			e_credentials_set (credentials, E_CREDENTIALS_KEY_PROMPT_TEXT, NULL);
-			e_credentials_set (credentials, E_CREDENTIALS_KEY_PROMPT_REASON, reason);
-		}
-	}
-
-	handled = async_data->auth_handler (client, credentials, async_data->auth_handler_user_data);
-
-	if (handled && credentials) {
-		if (async_data->used_credentials) {
-			gchar *prompt_flags_str;
-			guint prompt_flags = 0;
-
-			e_credentials_free (async_data->used_credentials);
-
-			prompt_flags_str = e_credentials_get (credentials, E_CREDENTIALS_KEY_PROMPT_FLAGS);
-			if (prompt_flags_str) {
-				prompt_flags = e_credentials_util_string_to_prompt_flags (prompt_flags_str);
-				g_free (prompt_flags_str);
-			} else {
-				prompt_flags = E_CREDENTIALS_PROMPT_FLAG_REMEMBER_FOREVER
-					     | E_CREDENTIALS_PROMPT_FLAG_SECRET
-					     | E_CREDENTIALS_PROMPT_FLAG_ONLINE;
-			}
-
-			prompt_flags |= E_CREDENTIALS_PROMPT_FLAG_REPROMPT;
-
-			prompt_flags_str = e_credentials_util_prompt_flags_to_string (prompt_flags);
-			e_credentials_set (credentials, E_CREDENTIALS_KEY_PROMPT_FLAGS, prompt_flags_str);
-			g_free (prompt_flags_str);
-		}
-
-		async_data->used_credentials = e_credentials_new_clone (credentials);
-	}
-
-	return handled;
-}
-
 /**
  * e_client_utils_open_new:
  * @source: an #ESource to be opened
  * @source_type: an #EClientSourceType of the @source
  * @only_if_exists: if %TRUE, fail if this client doesn't already exist, otherwise create it first
  * @cancellable: a #GCancellable; can be %NULL
- * @auth_handler: authentication handler, to be used; the e_client_utils_authenticate_handler() is usually sufficient
- * @auth_handler_user_data: user data for @auth_handler function
  * @async_cb: callback to call when a result is ready
  * @async_cb_user_data: user data for the @async_cb
  *
@@ -660,9 +363,6 @@ client_utils_open_new_auth_cb (EClient *client,
  * This call is finished by e_client_utils_open_new_finish()
  * from the @async_cb.
  *
- * Note: the @auth_handler, and its @auth_handler_user_data,
- * should be valid through whole live of returned #EClient.
- *
  * Since: 3.2
  **/
 void
@@ -670,8 +370,6 @@ e_client_utils_open_new (ESource *source,
                          EClientSourceType source_type,
                          gboolean only_if_exists,
                          GCancellable *cancellable,
-                         EClientUtilsAuthenticateHandler auth_handler,
-                         gpointer auth_handler_user_data,
                          GAsyncReadyCallback async_cb,
                          gpointer async_cb_user_data)
 {
@@ -691,8 +389,6 @@ e_client_utils_open_new (ESource *source,
 	}
 
 	async_data = g_new0 (EClientUtilsAsyncOpData, 1);
-	async_data->auth_handler = auth_handler;
-	async_data->auth_handler_user_data = auth_handler_user_data;
 	async_data->async_cb = async_cb;
 	async_data->async_cb_user_data = async_cb_user_data;
 	async_data->source = g_object_ref (source);
@@ -706,9 +402,6 @@ e_client_utils_open_new (ESource *source,
 	else
 		async_data->cancellable = g_cancellable_new ();
 
-	if (auth_handler)
-		g_signal_connect (client, "authenticate", G_CALLBACK (client_utils_open_new_auth_cb), async_data);
-
 	/* wait till backend notifies about its opened state */
 	g_signal_connect (client, "opened", G_CALLBACK (client_utils_opened_cb), async_data);
 
@@ -754,278 +447,3 @@ e_client_utils_open_new_finish (ESource *source,
 	return *client != NULL;
 }
 
-/* free returned pointer with g_free() */
-static gchar *
-get_prompt_key (EClient *client,
-                const gchar *user_name)
-{
-	SoupURI *suri;
-	gchar *uri_str;
-
-	g_return_val_if_fail (client != NULL, NULL);
-
-	suri = soup_uri_new (e_client_get_uri (client));
-	g_return_val_if_fail (suri != NULL, NULL);
-
-	soup_uri_set_user (suri, user_name);
-	soup_uri_set_password (suri, NULL);
-	soup_uri_set_fragment (suri, NULL);
-
-	uri_str = soup_uri_to_string (suri, FALSE);
-	soup_uri_free (suri);
-
-	return uri_str;
-}
-
-/**
- * e_client_utils_authenticate_handler:
- *
- * This function is suitable as a handler for EClient::authenticate signal.
- * It takes care of all the password prompt and such and returns TRUE if
- * credentials (password) were provided. Thus just connect it to that signal
- * and it'll take care of everything else.
- *
- * gtk_window_parent is user_data passed into the callback. It can be a pointer
- * to GtkWindow, used as a parent for a pasword prompt dialog.
- *
- * Since: 3.2
- **/
-gboolean
-e_client_utils_authenticate_handler (EClient *client,
-                                     ECredentials *credentials,
-                                     gpointer gtk_window_parent)
-{
-	ESource *source;
-	gboolean is_book, is_cal, res, remember_password = FALSE;
-	const gchar *prop;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (credentials != NULL, FALSE);
-
-	is_book = E_IS_BOOK_CLIENT (client);
-	is_cal = !is_book && E_IS_CAL_CLIENT (client);
-	g_return_val_if_fail (is_book || is_cal, FALSE);
-
-	source = e_client_get_source (client);
-	g_return_val_if_fail (source != NULL, FALSE);
-
-	if (!e_credentials_has_key (credentials, E_CREDENTIALS_KEY_USERNAME)) {
-		const gchar *username;
-
-		username = e_source_get_property (source, "username");
-		if (!username) {
-			const gchar *auth;
-
-			auth = e_source_get_property (source, "auth");
-			if (g_strcmp0 (auth, "ldap/simple-binddn") == 0)
-				username = e_source_get_property (source, "binddn");
-			else
-				username = e_source_get_property (source, "email_addr");
-
-			if (!username)
-				username = "";
-		}
-
-		e_credentials_set (credentials, E_CREDENTIALS_KEY_USERNAME, username);
-
-		/* no username set on the source - deny authentication request until
-		 * username will be also enterable with e-passwords */
-		if (!e_credentials_has_key (credentials, E_CREDENTIALS_KEY_USERNAME))
-			return FALSE;
-	}
-
-	if (!e_credentials_has_key (credentials, E_CREDENTIALS_KEY_PROMPT_KEY)) {
-		gchar *prompt_key = get_prompt_key (client, e_credentials_peek (credentials, E_CREDENTIALS_KEY_USERNAME));
-
-		e_credentials_set (credentials, E_CREDENTIALS_KEY_PROMPT_KEY, prompt_key);
-
-		g_free (prompt_key);
-	}
-
-	if (!e_credentials_has_key (credentials, E_CREDENTIALS_KEY_PROMPT_TEXT)) {
-		gchar *prompt, *reason;
-		gchar *username_markup, *source_name_markup;
-
-		reason = e_credentials_get (credentials, E_CREDENTIALS_KEY_PROMPT_REASON);
-		username_markup = g_markup_printf_escaped ("<b>%s</b>", e_credentials_peek (credentials, E_CREDENTIALS_KEY_USERNAME));
-		source_name_markup = g_markup_printf_escaped ("<b>%s</b>", e_source_peek_name (source));
-
-		if (is_cal) {
-			switch (e_cal_client_get_source_type (E_CAL_CLIENT (client))) {
-			default:
-				g_warn_if_reached ();
-			case E_CAL_CLIENT_SOURCE_TYPE_EVENTS:
-				if (reason && *reason)
-					prompt = g_strdup_printf (_("Enter password for calendar %s (user %s)\nReason: %s"), source_name_markup, username_markup, reason);
-				else
-					prompt = g_strdup_printf (_("Enter password for calendar %s (user %s)"), source_name_markup, username_markup);
-				break;
-			case E_CAL_CLIENT_SOURCE_TYPE_TASKS:
-				if (reason && *reason)
-					prompt = g_strdup_printf (_("Enter password for task list %s (user %s)\nReason: %s"), source_name_markup, username_markup, reason);
-				else
-					prompt = g_strdup_printf (_("Enter password for task list %s (user %s)"), source_name_markup, username_markup);
-				break;
-			case E_CAL_CLIENT_SOURCE_TYPE_MEMOS:
-				if (reason && *reason)
-					prompt = g_strdup_printf (_("Enter password for memo list %s (user %s)\nReason: %s"), source_name_markup, username_markup, reason);
-				else
-					prompt = g_strdup_printf (_("Enter password for memo list %s (user %s)"), source_name_markup, username_markup);
-				break;
-			}
-		} else {
-			if (reason && *reason)
-				prompt = g_strdup_printf (_("Enter password for address book %s (user %s)\nReason: %s"), source_name_markup, username_markup, reason);
-			else
-				prompt = g_strdup_printf (_("Enter password for address book %s (user %s)"), source_name_markup, username_markup);
-
-			if (!is_book)
-				g_warn_if_reached ();
-		}
-
-		e_credentials_set (credentials, E_CREDENTIALS_KEY_PROMPT_TEXT, prompt);
-
-		g_free (username_markup);
-		g_free (source_name_markup);
-		g_free (reason);
-		g_free (prompt);
-	}
-
-	prop = e_source_get_property (source, "remember_password");
-	remember_password = !prop || g_strcmp0 (prop, "true") == 0;
-
-	res = e_credentials_authenticate_helper (credentials, gtk_window_parent, &remember_password);
-
-	if (res)
-		e_source_set_property (source, "remember_password", remember_password ? "true" : "false");
-
-	e_credentials_clear_peek (credentials);
-
-	return res;
-}
-
-/**
- * e_client_utils_forget_password:
- * @client: An #EClient
- *
- * Forgets stored password for the given @client.
- *
- * Since: 3.2
- **/
-void
-e_client_utils_forget_password (EClient *client)
-{
-	gchar *prompt_key;
-	ESource *source;
-
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (E_IS_CLIENT (client));
-
-	source = e_client_get_source (client);
-	g_return_if_fail (source != NULL);
-
-	prompt_key = get_prompt_key (client, e_source_get_property (source, "username"));
-
-	e_passwords_forget_password (NULL, prompt_key);
-
-	g_free (prompt_key);
-}
-
-/** 
- * e_credentials_authenticate_helper:
- *
- * Asks for a password based on the provided credentials information.
- * Credentials should have set following keys:
- *    E_CREDENTIALS_KEY_USERNAME
- *    E_CREDENTIALS_KEY_PROMPT_KEY
- *    E_CREDENTIALS_KEY_PROMPT_TEXT
- * all other keys are optional. If also E_CREDENTIALS_KEY_PASSWORD key is provided,
- * then it implies a reprompt.
- *
- * When this returns TRUE, then the structure contains E_CREDENTIALS_KEY_PASSWORD set
- * as entered by a user.
- *
- * Since: 3.2
- **/
-gboolean
-e_credentials_authenticate_helper (ECredentials *credentials,
-                                   GtkWindow *parent,
-                                   gboolean *remember_password)
-{
-	gboolean res, fake_remember_password = FALSE;
-	guint prompt_flags;
-	gchar *password = NULL;
-	const gchar *title, *prompt_key;
-
-	g_return_val_if_fail (credentials != NULL, FALSE);
-	g_return_val_if_fail (e_credentials_has_key (credentials, E_CREDENTIALS_KEY_USERNAME), FALSE);
-	g_return_val_if_fail (e_credentials_has_key (credentials, E_CREDENTIALS_KEY_PROMPT_KEY), FALSE);
-	g_return_val_if_fail (e_credentials_has_key (credentials, E_CREDENTIALS_KEY_PROMPT_TEXT), FALSE);
-
-	if (e_credentials_has_key (credentials, E_CREDENTIALS_KEY_PROMPT_FLAGS)) {
-		prompt_flags = e_credentials_util_string_to_prompt_flags (e_credentials_peek (credentials, E_CREDENTIALS_KEY_PROMPT_FLAGS));
-	} else {
-		prompt_flags = E_CREDENTIALS_PROMPT_FLAG_REMEMBER_FOREVER
-			     | E_CREDENTIALS_PROMPT_FLAG_SECRET
-			     | E_CREDENTIALS_PROMPT_FLAG_ONLINE;
-	}
-
-	if (!remember_password) {
-		prompt_flags |= E_CREDENTIALS_PROMPT_FLAG_DISABLE_REMEMBER;
-		remember_password = &fake_remember_password;
-	}
-
-	if (e_credentials_has_key (credentials, E_CREDENTIALS_KEY_PASSWORD))
-		prompt_flags |= E_CREDENTIALS_PROMPT_FLAG_REPROMPT;
-
-	if (e_credentials_has_key (credentials, E_CREDENTIALS_KEY_PROMPT_TITLE))
-		title = e_credentials_peek (credentials, E_CREDENTIALS_KEY_PROMPT_TITLE);
-	else if (prompt_flags & E_CREDENTIALS_PROMPT_FLAG_PASSPHRASE)
-		title = _("Enter Passphrase");
-	else
-		title = _("Enter Password");
-
-	prompt_key = e_credentials_peek (credentials, E_CREDENTIALS_KEY_PROMPT_KEY);
-
-	if (!(prompt_flags & E_CREDENTIALS_PROMPT_FLAG_REPROMPT))
-		password = e_passwords_get_password (NULL, prompt_key);
-
-	if (!password)
-		password = e_passwords_ask_password (title, NULL, prompt_key,
-				e_credentials_peek (credentials, E_CREDENTIALS_KEY_PROMPT_TEXT),
-				prompt_flags, remember_password, parent);
-
-	res = password != NULL;
-
-	if (res)
-		e_credentials_set (credentials, E_CREDENTIALS_KEY_PASSWORD, password);
-
-	e_credentials_util_safe_free_string (password);
-	e_credentials_clear_peek (credentials);
-
-	return res;
-}
-
-/**
- * e_credentials_forget_password:
- * @credentials: an #ECredentials
- *
- * Forgets stored password for given @credentials, which should contain
- * E_CREDENTIALS_KEY_PROMPT_KEY.
- *
- * Since: 3.2
- **/
-void
-e_credentials_forget_password (const ECredentials *credentials)
-{
-	gchar *prompt_key;
-
-	g_return_if_fail (credentials != NULL);
-	g_return_if_fail (e_credentials_has_key (credentials, E_CREDENTIALS_KEY_PROMPT_KEY));
-
-	prompt_key = e_credentials_get (credentials, E_CREDENTIALS_KEY_PROMPT_KEY);
-
-	e_passwords_forget_password (NULL, prompt_key);
-
-	g_free (prompt_key);
-}
diff --git a/libedataserverui/e-client-utils.h b/libedataserverui/e-client-utils.h
index 1582a03..048abe1 100644
--- a/libedataserverui/e-client-utils.h
+++ b/libedataserverui/e-client-utils.h
@@ -41,33 +41,12 @@ typedef enum {
 	E_CLIENT_SOURCE_TYPE_LAST
 } EClientSourceType;
 
-/**
- * EClientUtilsAuthenticateHandler:
- *
- * Since: 3.2
- **/
-typedef gboolean (* EClientUtilsAuthenticateHandler) (EClient *client, ECredentials *credentials, gpointer user_data);
-
 EClient	*	e_client_utils_new			(ESource *source, EClientSourceType source_type, GError **error);
-EClient *	e_client_utils_new_from_uri		(const gchar *uri, EClientSourceType source_type, GError **error);
-EClient *	e_client_utils_new_system		(EClientSourceType source_type, GError **error);
-EClient *	e_client_utils_new_default		(EClientSourceType source_type, GError **error);
-
-gboolean	e_client_utils_set_default		(EClient *client, EClientSourceType source_type, GError **error);
-gboolean	e_client_utils_set_default_source	(ESource *source, EClientSourceType source_type, GError **error);
-gboolean	e_client_utils_get_sources		(ESourceList **sources, EClientSourceType source_type, GError **error);
 
 void		e_client_utils_open_new			(ESource *source, EClientSourceType source_type, gboolean only_if_exists, GCancellable *cancellable,
-							 EClientUtilsAuthenticateHandler auth_handler, gpointer auth_handler_user_data,
 							 GAsyncReadyCallback async_cb, gpointer async_cb_user_data);
 gboolean	e_client_utils_open_new_finish		(ESource *source, GAsyncResult *result, EClient **client, GError **error);
 
-gboolean	e_client_utils_authenticate_handler	(EClient *client, ECredentials *credentials, gpointer gtk_window_parent);
-void		e_client_utils_forget_password		(EClient *client);
-
-gboolean	e_credentials_authenticate_helper	(ECredentials *credentials, GtkWindow *parent, gboolean *remember_password);
-void		e_credentials_forget_password		(const ECredentials *credentials);
-
 G_END_DECLS
 
 #endif /* E_CLIENT_UTILS_H */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]