Mercurial > pidgin
changeset 23275:d9767a3993af
merge of '0de80ccd44f6ce7fe6942baa1e0dfc95a2878d05'
and 'e7fb4056cfb091389c5c657b97f95365799165e6'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Tue, 03 Jun 2008 05:12:51 +0000 |
| parents | 242fd82b5fe6 (diff) e61fd3bf9019 (current diff) |
| children | b87ce62751a2 |
| files | |
| diffstat | 1 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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);