[evolution-ews] EEwsConnection: Remove the EProxy.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-ews] EEwsConnection: Remove the EProxy.
- Date: Fri, 25 Oct 2013 17:29:02 +0000 (UTC)
commit 55fd92ee1b61b658014d778231b597cd6e1c743f
Author: Matthew Barnes <mbarnes redhat com>
Date: Thu Oct 10 10:52:43 2013 -0400
EEwsConnection: Remove the EProxy.
EProxy is deprecated. Will replace with the new proxy API.
src/server/e-ews-connection.c | 31 -------------------------------
1 files changed, 0 insertions(+), 31 deletions(-)
---
diff --git a/src/server/e-ews-connection.c b/src/server/e-ews-connection.c
index 0b0fa67..6d3af70 100644
--- a/src/server/e-ews-connection.c
+++ b/src/server/e-ews-connection.c
@@ -81,7 +81,6 @@ struct _EEwsConnectionPrivate {
GThread *soup_thread;
GMainLoop *soup_loop;
GMainContext *soup_context;
- EProxy *proxy;
CamelEwsSettings *settings;
GMutex property_lock;
@@ -1427,24 +1426,6 @@ create_folder_response_cb (ESoapResponse *response,
}
static void
-proxy_settings_changed (EProxy *proxy,
- gpointer user_data)
-{
- SoupURI *proxy_uri = NULL;
- EEwsConnection *cnc = (EEwsConnection *) user_data;
-
- if (!cnc || !cnc->priv || !cnc->priv->uri || !cnc->priv->soup_session)
- return;
-
- /* use proxy if necessary */
- if (e_proxy_require_proxy_for_uri (proxy, cnc->priv->uri)) {
- proxy_uri = e_proxy_peek_uri_for (proxy, cnc->priv->uri);
- }
-
- g_object_set (cnc->priv->soup_session, SOUP_SESSION_PROXY_URI, proxy_uri, NULL);
-}
-
-static void
ews_connection_set_settings (EEwsConnection *connection,
CamelEwsSettings *settings)
{
@@ -1538,11 +1519,6 @@ ews_connection_dispose (GObject *object)
priv->soup_context = NULL;
}
- if (priv->proxy) {
- g_object_unref (priv->proxy);
- priv->proxy = NULL;
- }
-
if (priv->settings != NULL) {
g_object_unref (priv->settings);
priv->settings = NULL;
@@ -1757,10 +1733,6 @@ e_ews_connection_init (EEwsConnection *cnc)
cnc->priv->version = E_EWS_EXCHANGE_UNKNOWN;
- cnc->priv->proxy = e_proxy_new ();
- e_proxy_setup_proxy (cnc->priv->proxy);
- g_signal_connect (cnc->priv->proxy, "changed", G_CALLBACK (proxy_settings_changed), cnc);
-
log_level = e_ews_debug_get_log_level ();
if (log_level >= 2) {
@@ -2140,9 +2112,6 @@ e_ews_connection_new_full (const gchar *uri,
g_strdup (cnc->priv->hash_key), cnc);
}
- /* update proxy with set 'uri' */
- proxy_settings_changed (cnc->priv->proxy, cnc);
-
/* free memory */
g_mutex_unlock (&connecting);
return cnc;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]