Fri, 26 Jun 2009 04:46:15 +0000
merge of 'fdbf18cfddc6d217d1bd9609af3fbf692604091a'
and '5e5dfa76ce64a4ec9c9e6e657283becca80b92d0'
--- a/libpurple/protocols/yahoo/yahoo_filexfer.c Fri Jun 26 01:28:09 2009 +0000 +++ b/libpurple/protocols/yahoo/yahoo_filexfer.c Fri Jun 26 04:46:15 2009 +0000 @@ -1831,14 +1831,13 @@ pkt_to_send = yahoo_packet_new(YAHOO_SERVICE_FILETRANS_ACC_15, YAHOO_STATUS_AVAILABLE, yd->session_id); - yahoo_packet_hash(pkt_to_send, "ssssisi", + yahoo_packet_hash(pkt_to_send, "ssssis", 1, purple_normalize(account, purple_account_get_username(account)), 5, xfer->who, 265, xfer_data->xfer_peer_idstring, 27, xfer->filename, 249, xfer_data->info_val_249, - 251, xfer_data->xfer_idstring_for_relay, - 222, 3); + 251, xfer_data->xfer_idstring_for_relay); yahoo_packet_send_and_free(pkt_to_send, yd);