aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2013-07-16 00:40:38 +0800
committerMilan Crha <mcrha@redhat.com>2013-07-16 00:40:38 +0800
commitdcf302c2ba303a26f6f6a356f2f71f22f81eeb02 (patch)
tree12b328d3f649d8751c0df6236fdeb5edc70f9c87 /modules
parent6565a88ded370eb48a25377f46b5fb2a7c9307f5 (diff)
downloadgsoc2013-evolution-dcf302c2ba303a26f6f6a356f2f71f22f81eeb02.tar
gsoc2013-evolution-dcf302c2ba303a26f6f6a356f2f71f22f81eeb02.tar.gz
gsoc2013-evolution-dcf302c2ba303a26f6f6a356f2f71f22f81eeb02.tar.bz2
gsoc2013-evolution-dcf302c2ba303a26f6f6a356f2f71f22f81eeb02.tar.lz
gsoc2013-evolution-dcf302c2ba303a26f6f6a356f2f71f22f81eeb02.tar.xz
gsoc2013-evolution-dcf302c2ba303a26f6f6a356f2f71f22f81eeb02.tar.zst
gsoc2013-evolution-dcf302c2ba303a26f6f6a356f2f71f22f81eeb02.zip
Bug #703389 - Proxy ignored for images
Diffstat (limited to 'modules')
-rw-r--r--modules/gravatar/e-gravatar-photo-source.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/modules/gravatar/e-gravatar-photo-source.c b/modules/gravatar/e-gravatar-photo-source.c
index 655046cd14..b41c689712 100644
--- a/modules/gravatar/e-gravatar-photo-source.c
+++ b/modules/gravatar/e-gravatar-photo-source.c
@@ -21,6 +21,7 @@
#include <libsoup/soup.h>
#include <libsoup/soup-requester.h>
#include <libsoup/soup-request-http.h>
+#include <libedataserver/libedataserver.h>
#define E_GRAVATAR_PHOTO_SOURCE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
@@ -69,6 +70,7 @@ gravatar_photo_source_get_photo_thread (GSimpleAsyncResult *simple,
GInputStream *stream = NULL;
gchar *hash;
gchar *uri;
+ EProxy *proxy;
GError *local_error = NULL;
async_context = g_simple_async_result_get_op_res_gpointer (simple);
@@ -81,6 +83,19 @@ gravatar_photo_source_get_photo_thread (GSimpleAsyncResult *simple,
session = soup_session_sync_new ();
+ 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);
+
requester = soup_requester_new ();
soup_session_add_feature (session, SOUP_SESSION_FEATURE (requester));