adium.1-4: f8ec537d: Fixed reference to PEER_PROXY_SERVER whi...

[evands at pidgin.im]

----------------------------------------------------------------------
Revision: f8ec537d9500e49f390edd63f33de0d22a2c7e56
Parent:   2cf653f0a15b26dd7936e8823786dcff52df3526
Author:   evands at pidgin.im
Date:     10/31/10 23:33:14
Branch:   im.pidgin.adium.1-4
URL: http://d.pidgin.im/viewmtn/revision/info/f8ec537d9500e49f390edd63f33de0d22a2c7e56

Changelog: 

Fixed reference to PEER_PROXY_SERVER which is now [AIM|ICQ]_PEER_PROXY_SERVER

Changes against parent 2cf653f0a15b26dd7936e8823786dcff52df3526

  patched  libpurple/protocols/oscar/peer.c

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/peer.c	4e0c41d59d5e3b4f6d709b2e1bfa73d53919436e
+++ libpurple/protocols/oscar/peer.c	c0cb2cc1ae500345f158e6d83c1e539f44073c66
@@ -892,7 +892,8 @@ peer_connection_trynext(PeerConnection *
 		}
 
 		purple_debug_info("oscar", "Attempting to connect via proxy %s:%hu",
-				(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);
 
 		conn->verified_connect_data = purple_proxy_connect(NULL, account,