aboutsummaryrefslogtreecommitdiffstats
path: root/camel/camel-http-stream.c
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2003-09-04 02:05:54 +0800
committerMichael Zucci <zucchi@src.gnome.org>2003-09-04 02:05:54 +0800
commit1d5176dbe5bb48f45e8cb9339b66d35e5df65554 (patch)
tree2c81078a7a652d2f26dfb2fde9690949d90e061c /camel/camel-http-stream.c
parent9a763746ccd9f51e37fba2ee8e68eec17622534d (diff)
downloadgsoc2013-evolution-1d5176dbe5bb48f45e8cb9339b66d35e5df65554.tar.gz
gsoc2013-evolution-1d5176dbe5bb48f45e8cb9339b66d35e5df65554.tar.zst
gsoc2013-evolution-1d5176dbe5bb48f45e8cb9339b66d35e5df65554.zip
** See bug #47765.
2003-08-20 Not Zed <NotZed@Ximian.com> ** See bug #47765. * camel-folder-search.h: Removed match1 member. * camel-folder-search.c (camel_folder_search_match_expression): use current directly rather than match1. This method isn't used anywhere anyway. (search_not): remove match1 stuff. (search_match_all): properly handle the match-all against 1 message as a scalar result, not an array result. 2003-09-03 Not Zed <NotZed@Ximian.com> * camel-http-stream.c (camel_http_stream_set_proxy): handle NULL proxy_url - unset the proxy. svn path=/trunk/; revision=22452
Diffstat (limited to 'camel/camel-http-stream.c')
-rw-r--r--camel/camel-http-stream.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/camel/camel-http-stream.c b/camel/camel-http-stream.c
index d9dc6e0d61..3217a11f55 100644
--- a/camel/camel-http-stream.c
+++ b/camel/camel-http-stream.c
@@ -557,8 +557,11 @@ camel_http_stream_set_proxy (CamelHttpStream *http_stream, const char *proxy_url
if (http_stream->proxy)
camel_url_free (http_stream->proxy);
-
- http_stream->proxy = camel_url_new (proxy_url, NULL);
+
+ if (proxy_url == NULL)
+ http_stream->proxy = NULL;
+ else
+ http_stream->proxy = camel_url_new (proxy_url, NULL);
}
void