pidgin.2.4.3: 7398f9c0: applied changes from ffe11b98734ebc297dc...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 7398f9c0edb31047e2eadfb1fbe1b4314daff8c9
Ancestor: b8bd9b176d317137a154983e390212e42020e29f
Author: datallah at pidgin.im
Date: 2008-06-19T03:09:38
Branch: im.pidgin.pidgin.2.4.3
URL: http://d.pidgin.im/viewmtn/revision/info/7398f9c0edb31047e2eadfb1fbe1b4314daff8c9

Modified files:
        libpurple/proxy.c

ChangeLog: 

applied changes from ffe11b98734ebc297dc36ad3e623bc945fdb5cc4
             through 0de80ccd44f6ce7fe6942baa1e0dfc95a2878d05

-------------- next part --------------
============================================================
--- libpurple/proxy.c	20d7678e2a21a7cac99ef00573ac5e68c0efbd81
+++ libpurple/proxy.c	f87694678d7cb6b0f0813f0877863453f712d821
@@ -265,6 +265,7 @@ purple_gnome_proxy_get_info(void)
 				"'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 @@ purple_gnome_proxy_get_info(void)
 			&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 @@ purple_gnome_proxy_get_info(void)
 			&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 @@ purple_gnome_proxy_get_info(void)
 			&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);