Mercurial > pidgin.yaz

diff libpurple/protocols/oscar/peer.c @ 31085:4297feb30ad1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged everything related to ICQ server changes. applied changes from b6d7712e90b68610df3bd2d8cbaf46d94c8b3794 through d849dc2a852a4ffdd345a150f0b88ab37de36e36 applied changes from 7aedaac3ed815cab16d758474a829d5ec5a59e4b through d849dc2a852a4ffdd345a150f0b88ab37de36e36
author ivan.komarov@soc.pidgin.im
date Sat, 30 Oct 2010 21:36:34 +0000
parents 0d3145e6b1d6
children 7c65c7054905
line wrap: on
line diff
--- a/libpurple/protocols/oscar/peer.c	Sat Oct 30 21:27:00 2010 +0000
+++ b/libpurple/protocols/oscar/peer.c	Sat Oct 30 21:36:34 2010 +0000
@@ -879,7 +879,9 @@
 		}
 
 		conn->verified_connect_data = purple_proxy_connect(NULL, account,
-				(conn->proxyip != NULL) ? conn->proxyip : PEER_PROXY_SERVER,
+				(conn->proxyip != NULL)
+					? conn->proxyip
+					: (conn->od->icq ? ICQ_PEER_PROXY_SERVER : AIM_PEER_PROXY_SERVER),
 				PEER_PROXY_PORT,
 				peer_proxy_connection_established_cb, conn);
 		if (conn->verified_connect_data != NULL)