GNOME.org
 

[evolution-ews] EEwsConnection: Remove the authenticate callback.

commit c5cd84a8e9c2c6fdf9cd9385fb566aceb7df6926
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Jul 30 16:51:57 2012 -0400

    EEwsConnection: Remove the authenticate callback.
    
    No longer used.

 src/addressbook/e-book-backend-ews.c               |    8 +++-----
 src/calendar/e-cal-backend-ews.c                   |    3 +--
 src/camel/camel-ews-store.c                        |    2 +-
 src/collection/e-ews-backend.c                     |    3 +--
 src/configuration/e-ews-config-utils.c             |    2 +-
 .../e-mail-config-ews-oal-combo-box.c              |    3 +--
 src/configuration/e-mail-config-ews-ooo-page.c     |    3 +--
 src/server/e-ews-connection.c                      |   11 +----------
 src/server/e-ews-connection.h                      |    2 --
 src/server/tests/test-autocompletion.c             |    3 +--
 src/server/tests/test-connection.c                 |    3 +--
 src/server/tests/test-createfolder.c               |    3 +--
 src/server/tests/test-cuditem.c                    |    3 +--
 src/server/tests/test-deletefolder.c               |    3 +--
 src/server/tests/test-get-oof-settings.c           |    3 +--
 src/server/tests/test-getattachment.c              |    3 +--
 src/server/tests/test-getdelegate.c                |    3 +--
 src/server/tests/test-set-oof-settings.c           |    3 +--
 src/server/tests/test-syncfolder.c                 |    9 +++------
 src/utils/ews-test-finditem-query.c                |    3 +--
 20 files changed, 23 insertions(+), 53 deletions(-)
---
diff --git a/src/addressbook/e-book-backend-ews.c b/src/addressbook/e-book-backend-ews.c
index 44b919c..1cecc58 100644
--- a/src/addressbook/e-book-backend-ews.c
+++ b/src/addressbook/e-book-backend-ews.c
@@ -1692,7 +1692,7 @@ ews_download_full_gal (EBookBackendEws *cbews,
 	comp_cache_file = g_build_filename (cache_dir, full->filename, NULL);
 
 	oab_cnc = e_ews_connection_new (
-		full_url, priv->password, ews_settings, NULL, NULL, NULL);
+		full_url, priv->password, ews_settings, NULL);
 	if (!e_ews_connection_download_oal_file_sync (
 		oab_cnc, comp_cache_file, NULL, NULL, cancellable, error))
 		goto exit;
@@ -1847,8 +1847,7 @@ ebews_start_gal_sync (gpointer data)
 	priv = cbews->priv;
 
 	oab_cnc = e_ews_connection_new (
-		priv->oab_url, priv->password,
-		ews_settings, NULL, NULL, NULL);
+		priv->oab_url, priv->password, ews_settings, NULL);
 
 	d(printf ("Ewsgal: Fetching oal full details file \n");)
 
@@ -2940,8 +2939,7 @@ book_backend_ews_try_password_sync (ESourceAuthenticator *authenticator,
 	hosturl = camel_ews_settings_dup_hosturl (ews_settings);
 
 	connection = e_ews_connection_new (
-		hosturl, password->str,
-		ews_settings, NULL, NULL, error);
+		hosturl, password->str, ews_settings, error);
 
 	g_free (hosturl);
 
diff --git a/src/calendar/e-cal-backend-ews.c b/src/calendar/e-cal-backend-ews.c
index 2f276f1..5817dfa 100644
--- a/src/calendar/e-cal-backend-ews.c
+++ b/src/calendar/e-cal-backend-ews.c
@@ -4071,8 +4071,7 @@ cal_backend_ews_try_password_sync (ESourceAuthenticator *authenticator,
 	hosturl = camel_ews_settings_dup_hosturl (ews_settings);
 
 	connection = e_ews_connection_new (
-		hosturl, password->str,
-		ews_settings, NULL, NULL, error);
+		hosturl, password->str, ews_settings, error);
 
 	g_free (hosturl);
 
diff --git a/src/camel/camel-ews-store.c b/src/camel/camel-ews-store.c
index 89ae4ca..10d698e 100644
--- a/src/camel/camel-ews-store.c
+++ b/src/camel/camel-ews-store.c
@@ -350,7 +350,7 @@ ews_authenticate_sync (CamelService *service,
 	hosturl = camel_ews_settings_dup_hosturl (ews_settings);
 
 	connection = e_ews_connection_new (
-		hosturl, password, ews_settings, NULL, NULL, NULL);
+		hosturl, password, ews_settings, NULL);
 
 	g_free (hosturl);
 
diff --git a/src/collection/e-ews-backend.c b/src/collection/e-ews-backend.c
index 17935e9..0e0e3ba 100644
--- a/src/collection/e-ews-backend.c
+++ b/src/collection/e-ews-backend.c
@@ -606,8 +606,7 @@ ews_backend_try_password_sync (ESourceAuthenticator *authenticator,
 	hosturl = camel_ews_settings_dup_hosturl (ews_settings);
 
 	connection = e_ews_connection_new (
-		hosturl, password->str,
-		ews_settings, NULL, NULL, error);
+		hosturl, password->str, ews_settings, error);
 
 	g_free (hosturl);
 
diff --git a/src/configuration/e-ews-config-utils.c b/src/configuration/e-ews-config-utils.c
index 0c7a2b1..3319ff4 100644
--- a/src/configuration/e-ews-config-utils.c
+++ b/src/configuration/e-ews-config-utils.c
@@ -276,7 +276,7 @@ ews_config_utils_authenticator_try_password_sync (ESourceAuthenticator *auth,
 
 	authenticator->conn = e_ews_connection_new (
 		hosturl, password->str, authenticator->ews_settings,
-		NULL, NULL, &local_error);
+		&local_error);
 
 	g_free (hosturl);
 	g_free (user);
diff --git a/src/configuration/e-mail-config-ews-oal-combo-box.c b/src/configuration/e-mail-config-ews-oal-combo-box.c
index 7e1030a..d10c934 100644
--- a/src/configuration/e-mail-config-ews-oal-combo-box.c
+++ b/src/configuration/e-mail-config-ews-oal-combo-box.c
@@ -156,8 +156,7 @@ mail_config_ews_oal_combo_box_try_password_sync (ESourceAuthenticator *auth,
 
 	/* XXX This takes a GError but never fails, so skip it. */
 	cnc = e_ews_connection_new (
-		oab_url, password->str,
-		ews_settings, NULL, NULL, NULL);
+		oab_url, password->str, ews_settings, NULL);
 
 	e_ews_connection_get_oal_list_sync (
 		cnc, &oal_items, cancellable, &local_error);
diff --git a/src/configuration/e-mail-config-ews-ooo-page.c b/src/configuration/e-mail-config-ews-ooo-page.c
index 32a0f6a..4ccde5a 100644
--- a/src/configuration/e-mail-config-ews-ooo-page.c
+++ b/src/configuration/e-mail-config-ews-ooo-page.c
@@ -798,8 +798,7 @@ mail_config_ews_ooo_page_try_password_sync (ESourceAuthenticator *auth,
 
 	/* XXX This takes a GError but never fails, so skip it. */
 	connection = e_ews_connection_new (
-		hosturl, password->str,
-		ews_settings, NULL, NULL, NULL);
+		hosturl, password->str, ews_settings, NULL);
 
 	e_ews_connection_set_mailbox (connection, mailbox);
 
diff --git a/src/server/e-ews-connection.c b/src/server/e-ews-connection.c
index a29a1d1..645b30e 100644
--- a/src/server/e-ews-connection.c
+++ b/src/server/e-ews-connection.c
@@ -1587,8 +1587,6 @@ EEwsConnection *
 e_ews_connection_new (const gchar *uri,
                       const gchar *password,
                       CamelEwsSettings *settings,
-                      GCallback authenticate_cb,
-                      gpointer authenticate_ctx,
                       GError **error)
 {
 	CamelNetworkSettings *network_settings;
@@ -1643,12 +1641,6 @@ e_ews_connection_new (const gchar *uri,
 		cnc->priv->soup_session, "timeout",
 		G_BINDING_SYNC_CREATE);
 
-	/* register a handler to the authenticate signal */
-	if (authenticate_cb)
-		g_signal_connect (
-			cnc, "authenticate",
-			authenticate_cb, authenticate_ctx);
-
 	/* add the connection to the loaded_connections_permissions hash table */
 	if (loaded_connections_permissions == NULL)
 		loaded_connections_permissions = g_hash_table_new_full (
@@ -2078,8 +2070,7 @@ e_ews_autodiscover_ws_url (CamelEwsSettings *settings,
 	if (user == NULL || *user == '\0')
 		user = email_address;
 
-	cnc = e_ews_connection_new (
-		url3, password, settings, NULL, NULL, &error);
+	cnc = e_ews_connection_new (url3, password, settings, &error);
 	if (cnc == NULL) {
 		g_free (url1);
 		g_free (url2);
diff --git a/src/server/e-ews-connection.h b/src/server/e-ews-connection.h
index 14b0b81..3dbf0e3 100644
--- a/src/server/e-ews-connection.h
+++ b/src/server/e-ews-connection.h
@@ -181,8 +181,6 @@ GType		e_ews_connection_get_type	(void);
 EEwsConnection *e_ews_connection_new		(const gchar *uri,
 						 const gchar *password,
 						 CamelEwsSettings *settings,
-						 GCallback authenticate_cb,
-						 gpointer authenticate_ctx,
 						 GError **error);
 const gchar *	e_ews_connection_get_uri	(EEwsConnection *cnc);
 CamelEwsSettings *
diff --git a/src/server/tests/test-autocompletion.c b/src/server/tests/test-autocompletion.c
index c2c1779..7190812 100644
--- a/src/server/tests/test-autocompletion.c
+++ b/src/server/tests/test-autocompletion.c
@@ -93,8 +93,7 @@ op_test_resolve_names ()
 		CAMEL_TYPE_EWS_SETTINGS,
 		"user", username, NULL);
 
-	cnc = e_ews_connection_new (
-		uri, password, settings, NULL, NULL, NULL);
+	cnc = e_ews_connection_new (uri, password, settings, NULL);
 	g_assert (cnc != NULL);
 
 	g_object_unref (settings);
diff --git a/src/server/tests/test-connection.c b/src/server/tests/test-connection.c
index 17ca399..23741fd 100644
--- a/src/server/tests/test-connection.c
+++ b/src/server/tests/test-connection.c
@@ -59,8 +59,7 @@ con_test_create_new_connection ()
 		CAMEL_TYPE_EWS_SETTINGS,
 		"user", username, NULL);
 
-	cnc = e_ews_connection_new (
-		uri, password, settings, NULL, NULL, NULL);
+	cnc = e_ews_connection_new (uri, password, settings, NULL);
 	g_assert (cnc != NULL);
 
 	g_object_unref (settings);
diff --git a/src/server/tests/test-createfolder.c b/src/server/tests/test-createfolder.c
index a4f1a10..c8e0cbd 100644
--- a/src/server/tests/test-createfolder.c
+++ b/src/server/tests/test-createfolder.c
@@ -90,8 +90,7 @@ op_test_create_folder ()
 		CAMEL_TYPE_EWS_SETTINGS,
 		"user", username, NULL);
 
-	cnc = e_ews_connection_new (
-		uri, password, settings, NULL, NULL, NULL);
+	cnc = e_ews_connection_new (uri, password, settings, NULL);
 	g_assert (cnc != NULL);
 
 	g_object_unref (settings);
diff --git a/src/server/tests/test-cuditem.c b/src/server/tests/test-cuditem.c
index 94bbbaf..fd491a9 100644
--- a/src/server/tests/test-cuditem.c
+++ b/src/server/tests/test-cuditem.c
@@ -113,8 +113,7 @@ op_test_create_item ()
 		CAMEL_TYPE_EWS_SETTINGS,
 		"user", username, NULL);
 
-	cnc = e_ews_connection_new (
-		uri, password, settings, NULL, NULL, NULL);
+	cnc = e_ews_connection_new (uri, password, settings, NULL);
 	g_assert (cnc != NULL);
 
 	g_object_unref (settings);
diff --git a/src/server/tests/test-deletefolder.c b/src/server/tests/test-deletefolder.c
index 3080e0a..73afbb7 100644
--- a/src/server/tests/test-deletefolder.c
+++ b/src/server/tests/test-deletefolder.c
@@ -81,8 +81,7 @@ op_test_delete_folder (gpointer data)
 		CAMEL_TYPE_EWS_SETTINGS,
 		"user", username, NULL);
 
-	cnc = e_ews_connection_new (
-		uri, password, settings, NULL, NULL, NULL);
+	cnc = e_ews_connection_new (uri, password, settings, NULL);
 	g_assert (cnc != NULL);
 
 	g_object_unref (settings);
diff --git a/src/server/tests/test-get-oof-settings.c b/src/server/tests/test-get-oof-settings.c
index 4c336dd..65f60d6 100644
--- a/src/server/tests/test-get-oof-settings.c
+++ b/src/server/tests/test-get-oof-settings.c
@@ -82,8 +82,7 @@ op_test_get_oof_settings ()
 		CAMEL_TYPE_EWS_SETTINGS,
 		"username", username, NULL);
 
-	cnc = e_ews_connection_new (
-		uri, password, settings, NULL, NULL, NULL);
+	cnc = e_ews_connection_new (uri, password, settings, NULL);
 	g_assert (cnc != NULL);
 
 	g_object_unref (settings);
diff --git a/src/server/tests/test-getattachment.c b/src/server/tests/test-getattachment.c
index 111e13c..8b17a85 100644
--- a/src/server/tests/test-getattachment.c
+++ b/src/server/tests/test-getattachment.c
@@ -87,8 +87,7 @@ op_test_get_attachments ()
 		CAMEL_TYPE_EWS_SETTINGS,
 		"user", username, NULL);
 
-	cnc = e_ews_connection_new (
-		uri, password, settings, NULL, NULL, NULL);
+	cnc = e_ews_connection_new (uri, password, settings, NULL);
 	g_assert (cnc != NULL);
 
 	g_object_unref (settings);
diff --git a/src/server/tests/test-getdelegate.c b/src/server/tests/test-getdelegate.c
index 172e1f7..980e61a 100644
--- a/src/server/tests/test-getdelegate.c
+++ b/src/server/tests/test-getdelegate.c
@@ -89,8 +89,7 @@ op_test_get_delegate ()
 		CAMEL_TYPE_EWS_SETTINGS,
 		"user", username, NULL);
 
-	cnc = e_ews_connection_new (
-		uri, password, settings, NULL, NULL, NULL);
+	cnc = e_ews_connection_new (uri, password, settings, NULL);
 	g_assert (cnc != NULL);
 
 	g_object_unref (settings);
diff --git a/src/server/tests/test-set-oof-settings.c b/src/server/tests/test-set-oof-settings.c
index ba03418..a09f1e1 100644
--- a/src/server/tests/test-set-oof-settings.c
+++ b/src/server/tests/test-set-oof-settings.c
@@ -97,8 +97,7 @@ op_test_set_oof_settings ()
 		CAMEL_TYPE_EWS_SETTINGS,
 		"user", username, NULL);
 
-	cnc = e_ews_connection_new (
-		uri, password, settings, NULL, NULL, NULL);
+	cnc = e_ews_connection_new (uri, password, settings, NULL);
 	g_assert (cnc != NULL);
 
 	g_object_unref (settings);
diff --git a/src/server/tests/test-syncfolder.c b/src/server/tests/test-syncfolder.c
index 4bc2bac..db6454e 100644
--- a/src/server/tests/test-syncfolder.c
+++ b/src/server/tests/test-syncfolder.c
@@ -105,8 +105,7 @@ op_test_sync_folder_items ()
 		CAMEL_TYPE_EWS_SETTINGS,
 		"user", username, NULL);
 
-	cnc = e_ews_connection_new (
-		uri, password, settings, NULL, NULL, NULL);
+	cnc = e_ews_connection_new (uri, password, settings, NULL);
 	g_assert (cnc != NULL);
 
 	g_object_unref (settings);
@@ -186,8 +185,7 @@ op_test_sync_folder_hierarchy ()
 		CAMEL_TYPE_EWS_SETTINGS,
 		"user", username, NULL);
 
-	cnc = e_ews_connection_new (
-		uri, password, settings, NULL, NULL, NULL);
+	cnc = e_ews_connection_new (uri, password, settings, NULL);
 	g_assert (cnc != NULL);
 
 	g_object_unref (settings);
@@ -255,8 +253,7 @@ op_test_get_item ()
 		CAMEL_TYPE_EWS_SETTINGS,
 		"user", username, NULL);
 
-	cnc = e_ews_connection_new (
-		uri, password, settings, NULL, NULL, NULL);
+	cnc = e_ews_connection_new (uri, password, settings, NULL);
 	g_assert (cnc != NULL);
 
 	g_object_unref (settings);
diff --git a/src/utils/ews-test-finditem-query.c b/src/utils/ews-test-finditem-query.c
index 364e7ee..dd2655c 100644
--- a/src/utils/ews-test-finditem-query.c
+++ b/src/utils/ews-test-finditem-query.c
@@ -117,8 +117,7 @@ op_test_finditem_run (void)
 		CAMEL_TYPE_EWS_SETTINGS,
 		"user", username, NULL);
 
-	cnc = e_ews_connection_new (
-		uri, password, settings, NULL, NULL, NULL);
+	cnc = e_ews_connection_new (uri, password, settings, NULL);
 	g_assert (cnc != NULL);
 
 	g_object_unref (settings);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]