pidgin.2.5.8: 7bd5ee15: Backport Sulabh's [5df439c3d330f72714400...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 7bd5ee15fbd0e8700c106be8e8700f3b1193a4a9
Ancestor: c43f49e4ab246e559658718f84094e1f7657224e
Author: rekkanoryo at pidgin.im
Date: 2009-06-26T21:49:46
Branch: im.pidgin.pidgin.2.5.8
URL: http://d.pidgin.im/viewmtn/revision/info/7bd5ee15fbd0e8700c106be8e8700f3b1193a4a9

Modified files:
        ChangeLog libpurple/protocols/yahoo/yahoo_filexfer.c

ChangeLog: 

Backport Sulabh's [5df439c3d330f7271440084acaa2c6f09701f781]:
Fix File transfer issue with Pidgin 2.5.7.

Fixes #9478.

-------------- next part --------------
============================================================
--- ChangeLog	456cddd02cacd1f94c56ca6dd811b371945c2cf5
+++ ChangeLog	8d227b3f853ff8ea5bbcd34824dbc981a0050a9c
@@ -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.
============================================================
--- libpurple/protocols/yahoo/yahoo_filexfer.c	f38251930529c23fbb16ae9912ca58859058dfd6
+++ libpurple/protocols/yahoo/yahoo_filexfer.c	0f5e661d256992c29a88588a61b2bb6384be03dd
@@ -1499,14 +1499,13 @@ void yahoo_process_filetrans_info_15(Pur
 	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,