# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1248628623 0
# Node ID 8bc9087b5ec2f24f54b3b05e566db00fedb28036
# Parent  a9187ae91656ad4d821b9bbeac4693a2f5148e19
And clean up two instances where Yahoo Japan needs to be correctly detected
and behavior changed accordingly.

diff -r a9187ae91656 -r 8bc9087b5ec2 libpurple/protocols/yahoo/yahoo_picture.c
--- a/libpurple/protocols/yahoo/yahoo_picture.c	Sun Jul 26 16:54:02 2009 +0000
+++ b/libpurple/protocols/yahoo/yahoo_picture.c	Sun Jul 26 17:17:03 2009 +0000
@@ -461,7 +461,7 @@
 
 	/* header + packet + "29" + 0xc0 + 0x80) + pictureblob */
 
-	host = purple_account_get_string(account, "xfer_host", YAHOO_XFER_HOST);
+	host = purple_account_get_string(account, "xfer_host", yd->jp? YAHOOJP_XFER_HOST : YAHOO_XFER_HOST);
 	port = purple_account_get_int(account, "xfer_port", YAHOO_XFER_PORT);
 	tmp = g_strdup_printf("%s:%d", host, port);
 	header = g_strdup_printf("POST %s%s/notifyft HTTP/1.1\r\n"
@@ -506,8 +506,8 @@
 	}
 
 	yd->buddy_icon_connect_data = purple_proxy_connect(NULL, account,
-			yd->jp ? purple_account_get_string(account, "xferjp_host",  YAHOOJP_XFER_HOST)
-			       : purple_account_get_string(account, "xfer_host",  YAHOO_XFER_HOST),
+			purple_account_get_string(account, "xfer_host",
+				yd->jp? YAHOOJP_XFER_HOST : YAHOO_XFER_HOST),
 			purple_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
 			yahoo_buddy_icon_upload_connected, d);