From e80ec71e4c532dcfd4f35edfed7d204336b530ce Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 Nov 2013 16:51:00 -0500 Subject: EMeetingStore: Remove deprecated EProxy usage. EMeetingStore needs an ESourceRegistry property so it can obtain an appropriate proxy ESource to serve as a GProxyResolver for the SoupSession. But frankly, this code is a mess and I can't be bothered right now. The SoupSession will just use the desktop-wide proxy settings which is fine for the vast majority of users. --- calendar/gui/e-meeting-store.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c index 3b7a772117..48c65da5d1 100644 --- a/calendar/gui/e-meeting-store.c +++ b/calendar/gui/e-meeting-store.c @@ -2004,7 +2004,6 @@ download_with_libsoup (const gchar *uri, { SoupSession *session; SoupMessage *msg; - EProxy *proxy; g_return_if_fail (uri != NULL); g_return_if_fail (qdata != NULL); @@ -2024,18 +2023,6 @@ download_with_libsoup (const gchar *uri, session, "authenticate", G_CALLBACK (soup_authenticate), NULL); - proxy = e_proxy_new (); - e_proxy_setup_proxy (proxy); - - if (e_proxy_require_proxy_for_uri (proxy, uri)) { - SoupURI *proxy_uri; - - proxy_uri = e_proxy_peek_uri_for (proxy, uri); - g_object_set (session, SOUP_SESSION_PROXY_URI, proxy_uri, NULL); - } - - g_object_unref (proxy); - soup_message_set_flags (msg, SOUP_MESSAGE_NO_REDIRECT); soup_message_add_header_handler ( msg, "got_body", "Location", -- cgit v1.2.3