# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1259859654 0
# Node ID 5af6304fde5d11865b1e0452a37e6de427e019c6
# Parent  ebb424b7e0a1cd8aded91b5d568d1d8be352d59e# Parent  0437b62ffaa52d0357d2c0bcc78b4b0e7df4133b
propagate from branch 'im.pidgin.pidgin' (head 2b7a2f20d950d118157c7629dfbfa17b7afb04f0)
            to branch 'im.pidgin.cpw.darkrain42.xmpp.scram' (head a7195390270427d08290c571865a54515cfb33fd)

diff -r 0437b62ffaa5 -r 5af6304fde5d ChangeLog
diff -r 0437b62ffaa5 -r 5af6304fde5d libpurple/proxy.c
--- a/libpurple/proxy.c	Thu Dec 03 05:46:10 2009 +0000
+++ b/libpurple/proxy.c	Thu Dec 03 17:00:54 2009 +0000
@@ -1088,6 +1088,7 @@
 static void
 http_start_connect_tunneling(PurpleProxyConnectData *connect_data) {
 	GString *request;
+	int ret;
 
 	purple_debug_info("proxy", "Using CONNECT tunneling for %s:%d\n",
 		connect_data->host, connect_data->port);