Mercurial > pidgin
changeset 26137:51bdaa82b95d
Remove check of version for file transfer, use only version 15 file transfer
| author | Sulabh Mahajan <sulabh@soc.pidgin.im> |
|---|---|
| date | Sun, 20 Jul 2008 16:51:19 +0000 |
| parents | 2666b864dc89 |
| children | 9a5da524fba9 |
| files | libpurple/protocols/yahoo/yahoo_filexfer.c |
| diffstat | 1 files changed, 7 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/yahoo_filexfer.c Sun Jul 20 15:27:22 2008 +0000 +++ b/libpurple/protocols/yahoo/yahoo_filexfer.c Sun Jul 20 16:51:19 2008 +0000 @@ -1043,28 +1043,16 @@ { struct yahoo_xfer_data *xfer_data; struct yahoo_data *yd = gc->proto_data; - int ver = 0; PurpleXfer *xfer = yahoo_new_xfer(gc, who); - YahooFriend *yf = yahoo_friend_find(gc, who); - - /* To determine if we should use yahoo p15 for transfer. Check other user's - * reported version, but if we're on Yahoo Japan, ignore it. */ - if(yf && yf->version_id > 500000 && !yd->jp) - ver = 15; - /* Default to ver 15 if user isn't a friend */ - if(!yf) - ver = 15; g_return_if_fail(xfer != NULL); - if(ver == 15) { - xfer_data = xfer->data; - xfer_data->status_15 = STARTED; - purple_xfer_set_init_fnc(xfer, yahoo_xfer_init_15); - xfer_data->version = 15; - xfer_data->xfer_peer_idstring = yahoo_xfer_new_xfer_id(); - g_hash_table_insert(yd->xfer_peer_idstring_map, xfer_data->xfer_peer_idstring, xfer); - } + xfer_data = xfer->data; + xfer_data->status_15 = STARTED; + purple_xfer_set_init_fnc(xfer, yahoo_xfer_init_15); + xfer_data->version = 15; + xfer_data->xfer_peer_idstring = yahoo_xfer_new_xfer_id(); + g_hash_table_insert(yd->xfer_peer_idstring_map, xfer_data->xfer_peer_idstring, xfer); /* Now perform the request */ if (file) @@ -1822,7 +1810,7 @@ PurpleAccount *account; long val_66 = 0; gchar *url = NULL; - int val_249; + int val_249 = 0; yd = gc->proto_data; for (l = pkt->hash; l; l = l->next) {