From dcf302c2ba303a26f6f6a356f2f71f22f81eeb02 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 15 Jul 2013 18:40:38 +0200
Subject: Bug #703389 - Proxy ignored for images

---
 mail/e-http-request.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'mail/e-http-request.c')

diff --git a/mail/e-http-request.c b/mail/e-http-request.c
index 14bfdda181..fb516f98ba 100644
--- a/mail/e-http-request.c
+++ b/mail/e-http-request.c
@@ -334,6 +334,7 @@ handle_http_request (GSimpleAsyncResult *res,
 		CamelStream *cache_stream;
 		GError *error;
 		GMainContext *context;
+		EProxy *proxy;
 
 		context = g_main_context_new ();
 		g_main_context_push_thread_default (context);
@@ -342,6 +343,19 @@ handle_http_request (GSimpleAsyncResult *res,
 				SOUP_SESSION_TIMEOUT, 90,
 				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_clear_object (&proxy);
+
 		message = soup_message_new (SOUP_METHOD_GET, uri);
 		soup_message_headers_append (
 			message->request_headers, "User-Agent", "Evolution/" VERSION);
-- 
cgit v1.2.3