Mercurial > pidgin
comparison libpurple/proxy.c @ 30578:0accc8adb18a
merge of '2f6318bd834113559a405ec68cdb178f2180b680'
and '64e02b98551e11e093e4649f1516f3aceaa321e2'
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Sun, 26 Sep 2010 20:16:15 +0000 |
parents | 7c871249318b |
children | 9a7c5d242521 |
comparison
equal
deleted
inserted
replaced
30577:7b761c8601f7 | 30578:0accc8adb18a |
---|---|
1021 connect_data->host, connect_data->port, | 1021 connect_data->host, connect_data->port, |
1022 response); | 1022 response); |
1023 | 1023 |
1024 g_free(response); | 1024 g_free(response); |
1025 | 1025 |
1026 } else if((header = g_strrstr((const char *)connect_data->read_buffer, "Proxy-Authenticate: Basic"))) { | 1026 } else if (g_strrstr((const char *)connect_data->read_buffer, "Proxy-Authenticate: Basic") != NULL) { |
1027 gchar *t1, *t2; | 1027 gchar *t1, *t2; |
1028 const char *username, *password; | 1028 const char *username, *password; |
1029 | 1029 |
1030 username = purple_proxy_info_get_username(connect_data->gpi); | 1030 username = purple_proxy_info_get_username(connect_data->gpi); |
1031 password = purple_proxy_info_get_password(connect_data->gpi); | 1031 password = purple_proxy_info_get_password(connect_data->gpi); |