adium: 3ce0bc8e: applied changes from 2cf653f0a15b26dd793...

[evands at pidgin.im]

----------------------------------------------------------------------
Revision: 3ce0bc8e8aa53725cf63a582be307a16a5602906
Parent:   2cf653f0a15b26dd7936e8823786dcff52df3526
Author:   evands at pidgin.im
Date:     10/31/10 23:34:50
Branch:   im.pidgin.adium
URL: http://d.pidgin.im/viewmtn/revision/info/3ce0bc8e8aa53725cf63a582be307a16a5602906

Changelog: 

applied changes from 2cf653f0a15b26dd7936e8823786dcff52df3526
             through f8ec537d9500e49f390edd63f33de0d22a2c7e56

Changes against parent 2cf653f0a15b26dd7936e8823786dcff52df3526

  patched  libpurple/protocols/oscar/peer.c
  patched  libpurple/protocols/yahoo/libymsg.c

-------------- next part --------------
============================================================
--- libpurple/protocols/yahoo/libymsg.c	aedcc38fb75b9a99be6cb60666cd72a4e2376158
+++ libpurple/protocols/yahoo/libymsg.c	dc6627d1bc89c2b20a6e886c13e7ef38df7bb081
@@ -5133,6 +5133,9 @@ void yahoo_change_buddys_group(PurpleCon
 	YahooFriend *f = yahoo_friend_find(gc, who);
 	const char *temp = NULL;
 
+	purple_debug_info("yahoo", "Moving buddy %s from %s to %s",
+					  who, old_group, new_group);
+
 	/* Step 0:  If they aren't on the server list anyway,
 	 *          don't bother letting the server know.
 	 */
@@ -5165,6 +5168,9 @@ void yahoo_change_buddys_group(PurpleCon
 		yahoo_packet_hash(pkt, "ssssssss", 1, purple_connection_get_display_name(gc),
 	                  302, "240", 300, "240", 7, temp, 224, gpo, 264, gpn, 301,
 	                  "240", 303, "240");
+
+	purple_debug_info("yahoo", "Performing move");
+
 	yahoo_packet_send_and_free(pkt, yd);
 
 	g_free(gpn);
============================================================
--- 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,