# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1212469971 0
# Node ID d9767a3993af60bb410729298c3469a90edfffab
# Parent  242fd82b5fe6c87ae3bf469eb0d3961e53f9ea42# Parent  e61fd3bf90198a2675519689676162ab359b4d7e
merge of '0de80ccd44f6ce7fe6942baa1e0dfc95a2878d05'
     and 'e7fb4056cfb091389c5c657b97f95365799165e6'

diff -r e61fd3bf9019 -r d9767a3993af libpurple/proxy.c
--- a/libpurple/proxy.c	Tue Jun 03 02:31:28 2008 +0000
+++ b/libpurple/proxy.c	Tue Jun 03 05:12:51 2008 +0000
@@ -265,6 +265,7 @@
 				"'manual' but no proxy server is specified.  Using "
 				"Pidgin's proxy settings instead.\n");
 		g_free(info.host);
+		info.host = NULL;
 		return purple_global_proxy_get_info();
 	}
 
@@ -272,6 +273,7 @@
 			&info.username, NULL, NULL, NULL))
 	{
 		g_free(info.host);
+		info.host = NULL;
 		return purple_global_proxy_get_info();
 	}
 	g_strchomp(info.username);
@@ -280,7 +282,9 @@
 			&info.password, NULL, NULL, NULL))
 	{
 		g_free(info.host);
+		info.host = NULL;
 		g_free(info.username);
+		info.username = NULL;
 		return purple_global_proxy_get_info();
 	}
 	g_strchomp(info.password);
@@ -289,8 +293,11 @@
 			&tmp, NULL, NULL, NULL))
 	{
 		g_free(info.host);
+		info.host = NULL;
 		g_free(info.username);
+		info.username = NULL;
 		g_free(info.password);
+		info.password = NULL;
 		return purple_global_proxy_get_info();
 	}
 	info.port = atoi(tmp);