Backport Sulabh's [5df439c3d330f7271440084acaa2c6f09701f781]:

Fix File transfer issue with Pidgin 2.5.7.

Fixes #9478.

2 files changed, 4 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index a67832e6a6..17ed41fa05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@ version 2.5.8 (06/26/2009):
 	* Fixed the crashes some users were seeing with cn.scs.msg.yahoo.com in
 	  2.5.7.
 	* Fixed compiling on systems with glib 2.4.x or older.
+	* Fixed an issue with file transfers.  This may not resolve all issues,
+	  but it should resolve at least some of the most common ones.
 	* The pager server will automatically update to scsa.msg.yahoo.com if the
 	  user empties the field or if it is scs.msg.yahoo.com.  This should ease
 	  the pain of transition to the new login method.
diff --git a/libpurple/protocols/yahoo/yahoo_filexfer.c b/libpurple/protocols/yahoo/yahoo_filexfer.c
index 03af732d3e..8c3d204c72 100644
--- a/libpurple/protocols/yahoo/yahoo_filexfer.c
+++ b/libpurple/protocols/yahoo/yahoo_filexfer.c
@@ -1499,14 +1499,13 @@ void yahoo_process_filetrans_info_15(PurpleConnection *gc, struct yahoo_packet *
 	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);
 	if (purple_proxy_connect(NULL, account, xfer_data->host, xfer_data->port,