diff options
| author | Milan Crha <mcrha@redhat.com> | 2009-02-09 18:59:29 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@src.gnome.org> | 2009-02-09 18:59:29 +0800 |
| commit | f44568a253d5c798c71469b6e7d6fca905c0c356 (patch) | |
| tree | 1a02d2034585a656c8db9aba345ab45322636214 /mail/em-format-html.c | |
| parent | de1b9c79794d17fd5d953de81e24c7c1beadffbc (diff) | |
| download | gsoc2013-evolution-f44568a253d5c798c71469b6e7d6fca905c0c356.tar.gz gsoc2013-evolution-f44568a253d5c798c71469b6e7d6fca905c0c356.tar.zst gsoc2013-evolution-f44568a253d5c798c71469b6e7d6fca905c0c356.zip | |
** Part of fix for bug #555888
2009-02-09 Milan Crha <mcrha@redhat.com>
** Part of fix for bug #555888
* mail-config.glade:
* em-network-prefs.h: (struct _EMNetworkPrefs):
* em-network-prefs.c: (emnp_parse_ignore_hosts),
(emnp_load_sys_settings), (notify_proxy_type_changed),
(em_network_prefs_construct):
Do not overwrite user settings with system proxy settings.
Register signals at the end, when all widgets are read.
Hide socks settings, it is not used at the moment.
* em-utils.h: (em_utils_get_proxy_uri):
* em-utils.c: (em_utils_get_proxy_uri), (emu_proxy_setup):
* em-format-html.c: (emfh_gethttp):
Use proxy configurable within Evolution.
svn path=/trunk/; revision=37236
Diffstat (limited to 'mail/em-format-html.c')
| -rw-r--r-- | mail/em-format-html.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mail/em-format-html.c b/mail/em-format-html.c index b6ad57c71b..f813ef01fb 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -498,9 +498,11 @@ static void emfh_gethttp(struct _EMFormatHTMLJob *job, int cancelled) instream = camel_http_stream_new(CAMEL_HTTP_METHOD_GET, ((EMFormat *)job->format)->session, url); camel_http_stream_set_user_agent((CamelHttpStream *)instream, "CamelHttpStream/1.0 Evolution/" VERSION); - proxy = em_utils_get_proxy_uri(); - camel_http_stream_set_proxy((CamelHttpStream *)instream, proxy); - g_free(proxy); + proxy = em_utils_get_proxy_uri (job->u.uri); + if (proxy) { + camel_http_stream_set_proxy ((CamelHttpStream *)instream, proxy); + g_free (proxy); + } camel_operation_start(NULL, _("Retrieving `%s'"), job->u.uri); tmp_stream = (CamelHttpStream *)instream; content_type = camel_http_stream_get_content_type(tmp_stream); |