Mercurial > pidgin

comparison libpurple/protocols/yahoo/yahoo_picture.c @ 27693:8bc9087b5ec2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 4bfaf18fcb13
children 908be3822215
comparison
equal deleted inserted replaced
27692:a9187ae91656 27693:8bc9087b5ec2
459 pkt_buf_len = yahoo_packet_build(pkt, 4, FALSE, yd->jp, &pkt_buf); 459 pkt_buf_len = yahoo_packet_build(pkt, 4, FALSE, yd->jp, &pkt_buf);
460 yahoo_packet_free(pkt); 460 yahoo_packet_free(pkt);
461 461
462 /* header + packet + "29" + 0xc0 + 0x80) + pictureblob */ 462 /* header + packet + "29" + 0xc0 + 0x80) + pictureblob */
463 463
464 host = purple_account_get_string(account, "xfer_host", YAHOO_XFER_HOST); 464 host = purple_account_get_string(account, "xfer_host", yd->jp? YAHOOJP_XFER_HOST : YAHOO_XFER_HOST);
465 port = purple_account_get_int(account, "xfer_port", YAHOO_XFER_PORT); 465 port = purple_account_get_int(account, "xfer_port", YAHOO_XFER_PORT);
466 tmp = g_strdup_printf("%s:%d", host, port); 466 tmp = g_strdup_printf("%s:%d", host, port);
467 header = g_strdup_printf("POST %s%s/notifyft HTTP/1.1\r\n" 467 header = g_strdup_printf("POST %s%s/notifyft HTTP/1.1\r\n"
468 "User-Agent: " YAHOO_CLIENT_USERAGENT "\r\n" 468 "User-Agent: " YAHOO_CLIENT_USERAGENT "\r\n"
469 "Cookie: T=%s; Y=%s\r\n" 469 "Cookie: T=%s; Y=%s\r\n"
504 purple_proxy_connect_cancel(yd->buddy_icon_connect_data); 504 purple_proxy_connect_cancel(yd->buddy_icon_connect_data);
505 yd->buddy_icon_connect_data = NULL; 505 yd->buddy_icon_connect_data = NULL;
506 } 506 }
507 507
508 yd->buddy_icon_connect_data = purple_proxy_connect(NULL, account, 508 yd->buddy_icon_connect_data = purple_proxy_connect(NULL, account,
509 yd->jp ? purple_account_get_string(account, "xferjp_host", YAHOOJP_XFER_HOST) 509 purple_account_get_string(account, "xfer_host",
510 : purple_account_get_string(account, "xfer_host", YAHOO_XFER_HOST), 510 yd->jp? YAHOOJP_XFER_HOST : YAHOO_XFER_HOST),
511 purple_account_get_int(account, "xfer_port", YAHOO_XFER_PORT), 511 purple_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
512 yahoo_buddy_icon_upload_connected, d); 512 yahoo_buddy_icon_upload_connected, d);
513 513
514 if (yd->buddy_icon_connect_data == NULL) 514 if (yd->buddy_icon_connect_data == NULL)
515 { 515 {