# HG changeset patch
# User Sulabh Mahajan <sulabh@soc.pidgin.im>
# Date 1245991575 0
# Node ID 6e4b0ecde9b4e6f8cda4d462ef96bb075cce874e
# Parent  7492ddb953fd7cf0ae24ec924b84606483f7990f# Parent  f8428553f11c8323b4b09c15d1d319311c572c78
merge of '03e380d307e9063ff3938a7ccab18085899c6140'
     and '5df439c3d330f7271440084acaa2c6f09701f781'

diff -r 7492ddb953fd -r 6e4b0ecde9b4 libpurple/protocols/yahoo/yahoo_filexfer.c
--- 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);