Mercurial > pidgin
diff libpurple/proxy.c @ 26162:0a19fa42f8ce
propagate from branch 'im.pidgin.pidgin' (head eeaad582dcb34b6753c78371c4aa03af92b095f5)
to branch 'im.pidgin.soc.2008.yahoo' (head 182668e30410a6c12e970fad010f219ee6b59e73)
| author | Sulabh Mahajan <sulabh@soc.pidgin.im> |
|---|---|
| date | Tue, 20 Jan 2009 17:44:36 +0000 |
| parents | 95ef7beb926b |
| children | de01d4aa4571 a6e3cb32cdd2 4670851af098 |
line wrap: on
line diff
--- a/libpurple/proxy.c Tue Jan 20 17:11:35 2009 +0000 +++ b/libpurple/proxy.c Tue Jan 20 17:44:36 2009 +0000 @@ -621,7 +621,7 @@ if (!PURPLE_PROXY_CONNECT_DATA_IS_VALID(connect_data)) return; - purple_debug_info("proxy", "Connected to %s:%d.\n", + purple_debug_info("proxy", "Connecting to %s:%d.\n", connect_data->host, connect_data->port); /* @@ -944,12 +944,15 @@ } else if((header = g_strrstr((const char *)connect_data->read_buffer, "Proxy-Authenticate: Basic"))) { gchar *t1, *t2; + const char *username, *password; + + username = purple_proxy_info_get_username(connect_data->gpi); + password = purple_proxy_info_get_password(connect_data->gpi); t1 = g_strdup_printf("%s:%s", - purple_proxy_info_get_username(connect_data->gpi), - purple_proxy_info_get_password(connect_data->gpi) ? - purple_proxy_info_get_password(connect_data->gpi) : ""); - t2 = purple_base64_encode((const guchar *)t1, strlen(t1)); + username ? username : "", + password ? password : ""); + t2 = purple_base64_encode((guchar *)t1, strlen(t1)); g_free(t1); request = g_strdup_printf( @@ -1342,7 +1345,7 @@ if ((buf[0] != 0x05) || (buf[1] != 0x00)) { if ((buf[0] == 0x05) && (buf[1] < 0x09)) { - purple_debug_error("socks5 proxy", socks5errors[buf[1]]); + purple_debug_error("socks5 proxy", "%s", socks5errors[buf[1]]); purple_proxy_connect_data_disconnect(connect_data, socks5errors[buf[1]]); } else {