Mercurial > pidgin
changeset 27693:8bc9087b5ec2
And clean up two instances where Yahoo Japan needs to be correctly detected
and behavior changed accordingly.
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Sun, 26 Jul 2009 17:17:03 +0000 |
| parents | a9187ae91656 |
| children | 908be3822215 |
| files | libpurple/protocols/yahoo/yahoo_picture.c |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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);