cpw.malu.xmpp.jingle_ft: 0aa1bd9c: Actually send a transport-accept when ge...

malu at pidgin.im malu at pidgin.im
Sun May 10 15:05:28 EDT 2009


-----------------------------------------------------------------
Revision: 0aa1bd9c434d7a0e0d62cf38ab16ec317b95385c
Ancestor: 0d69908f1b59b87e0d3d28acbe7a60f41d06197c
Author: malu at pidgin.im
Date: 2009-05-08T16:06:47
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/0aa1bd9c434d7a0e0d62cf38ab16ec317b95385c

Modified files:
        libpurple/protocols/jabber/jingle/file-transfer.c

ChangeLog: 

Actually send a transport-accept when getting a transport-replace to 
fallback to IBB

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jingle/file-transfer.c	a9a557d63274169a24a22ccc73c59efc65ea9f4c
+++ libpurple/protocols/jabber/jingle/file-transfer.c	0015b6086fb81e0e90680c687b81b72930aa0af5
@@ -11,7 +11,7 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * Foundation, Inc., 51 Franklin SANSston, MA 02110-1301,  USA
  */
 
 #include "internal.h"
@@ -879,16 +879,16 @@ jingle_file_transfer_handle_action_inter
 			gchar *who = jingle_session_get_remote_jid(session);
 			const PurpleXfer *xfer = JINGLE_FT(content)->priv->xfer;
 			const gchar *filename = purple_xfer_get_local_filename(xfer);
-			
+
 			/* fallback to IBB etc... */
 			if (JINGLE_IS_IBB(new_transport)) {
 				JingleIBB *ibb = JINGLE_IBB(new_transport);
-				
+
 				jingle_ibb_create_session(ibb, content, sid, who);
 				/* immediatly accept the new transport */
 				jingle_content_set_pending_transport(content, new_transport);
 				jingle_content_accept_transport(content);
-				
+
 				/* open the file and setup the callbacks */
 				JINGLE_FT_GET_PRIVATE(JINGLE_FT(content))->ibb_fp = 
 					g_fopen(filename, "wb");
@@ -911,14 +911,15 @@ jingle_file_transfer_handle_action_inter
 					jingle_file_transfer_ibb_data_recv_callback);
 				jingle_ibb_set_error_callback(ibb,
 					jingle_file_transfer_ibb_error_callback);
-	
+
 				/* start the transfer */
 				purple_xfer_start(xfer, 0, NULL, 0);
-				
+
 				/* send transport-accept */
-				
+				jabber_iq_send(jingle_session_to_packet(session,
+                    JINGLE_TRANSPORT_ACCEPT));
 			}
-			
+
 			g_free(who);
 			g_object_unref(session);
 			break;


More information about the Commits mailing list