pidgin: 87a003ee: And clean up two instances where Yahoo J...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 87a003eec3a98d8c441b6702a57e4b7f5f41be03
Ancestor: 826646e68951b015d457f7e0e6aca5663685e813
Author: rekkanoryo at pidgin.im
Date: 2009-07-26T17:17:03
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/87a003eec3a98d8c441b6702a57e4b7f5f41be03

Modified files:
        libpurple/protocols/yahoo/yahoo_picture.c

ChangeLog: 

And clean up two instances where Yahoo Japan needs to be correctly detected
and behavior changed accordingly.

-------------- next part --------------
============================================================
--- libpurple/protocols/yahoo/yahoo_picture.c	662606e6040315f7478b610b3b08f77f67a9f1ce
+++ libpurple/protocols/yahoo/yahoo_picture.c	5584fef71684284730c4bc52e8144d7877f8e8ab
@@ -461,7 +461,7 @@ static void yahoo_buddy_icon_upload_conn
 
 	/* 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 @@ void yahoo_buddy_icon_upload(PurpleConne
 	}
 
 	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);