Mercurial > pidgin

comparison libgaim/protocols/yahoo/yahoo_picture.c @ 14837:118fd0dc5b6e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 17606] Add a "handle" parameter to gaim_proxy_connect(). It seemed like people thought this was a good idea. You can still cancel each gaim_proxy_connect() individually, if needed. I passed in NULL for the handle in most places. It might be better to pass in the gc in more places, but these changes do no harm, and they should help some Yahoo! things, and I wanted to get the API change in. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sat, 28 Oct 2006 20:04:03 +0000
parents 622931ca5622
children f4705e2c2026
comparison
equal deleted inserted replaced
14836:bfcdd361357e 14837:118fd0dc5b6e
509 gaim_proxy_connect_cancel(yd->buddy_icon_connect_data); 509 gaim_proxy_connect_cancel(yd->buddy_icon_connect_data);
510 yd->buddy_icon_connect_data = NULL; 510 yd->buddy_icon_connect_data = NULL;
511 } 511 }
512 512
513 if (yd->jp) { 513 if (yd->jp) {
514 if ((connect_data = gaim_proxy_connect(account, gaim_account_get_string(account, "xferjp_host", YAHOOJP_XFER_HOST), 514 if ((connect_data = gaim_proxy_connect(NULL, account, gaim_account_get_string(account, "xferjp_host", YAHOOJP_XFER_HOST),
515 gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT), 515 gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
516 yahoo_buddy_icon_upload_connected, d)) == NULL) 516 yahoo_buddy_icon_upload_connected, d)) == NULL)
517 { 517 {
518 gaim_debug_error("yahoo", "Uploading our buddy icon failed to connect.\n"); 518 gaim_debug_error("yahoo", "Uploading our buddy icon failed to connect.\n");
519 yahoo_buddy_icon_upload_data_free(d); 519 yahoo_buddy_icon_upload_data_free(d);
520 } 520 }
521 } else { 521 } else {
522 if ((connect_data = gaim_proxy_connect(account, gaim_account_get_string(account, "xfer_host", YAHOO_XFER_HOST), 522 if ((connect_data = gaim_proxy_connect(NULL, account, gaim_account_get_string(account, "xfer_host", YAHOO_XFER_HOST),
523 gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT), 523 gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
524 yahoo_buddy_icon_upload_connected, d)) == NULL) 524 yahoo_buddy_icon_upload_connected, d)) == NULL)
525 { 525 {
526 gaim_debug_error("yahoo", "Uploading our buddy icon failed to connect.\n"); 526 gaim_debug_error("yahoo", "Uploading our buddy icon failed to connect.\n");
527 yahoo_buddy_icon_upload_data_free(d); 527 yahoo_buddy_icon_upload_data_free(d);