From 1d5176dbe5bb48f45e8cb9339b66d35e5df65554 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Wed, 3 Sep 2003 18:05:54 +0000 Subject: ** See bug #47765. 2003-08-20 Not Zed ** 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 * camel-http-stream.c (camel_http_stream_set_proxy): handle NULL proxy_url - unset the proxy. svn path=/trunk/; revision=22452 --- camel/camel-http-stream.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'camel/camel-http-stream.c') 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 -- cgit v1.2.3