cpw.malu.xmpp.jingle_ft: 87608eb0: When activating a bytestream proxy, the ...

malu at pidgin.im malu at pidgin.im
Wed Apr 22 18:06:46 EDT 2009


-----------------------------------------------------------------
Revision: 87608eb0a4946985272558c85bc6ef157c1b37ee
Ancestor: c0341b35aceecc12b3b8ce37d55b0f79f08f619d
Author: malu at pidgin.im
Date: 2009-04-22T22:00:21
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/87608eb0a4946985272558c85bc6ef157c1b37ee

Modified files:
        libpurple/protocols/jabber/jingle/s5b.c

ChangeLog: 

When activating a bytestream proxy, the target JID is not always the remote
JID of the Jingle session, but the JID of the other end of the transfer

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jingle/s5b.c	7c91265dbc93a9d1e994c75ed1ee9c13d4ec3a6b
+++ libpurple/protocols/jabber/jingle/s5b.c	1427ce19ab51ddcb2d31c1129d732bb8815020cc
@@ -1234,7 +1234,11 @@ jingle_s5b_proxy_connect_cb(gpointer dat
 	query = xmlnode_get_child(iq->node, "query");
 	xmlnode_set_attrib(query, "sid", s5b->priv->sid);
 	activate = xmlnode_new_child(query, "activate");
-	xmlnode_insert_data(activate, jingle_session_get_remote_jid(session), -1);
+	if (jingle_session_is_initiator(session)) {
+		xmlnode_insert_data(activate, jingle_session_get_remote_jid(session), -1);
+	} else {
+		xmlnode_insert_data(activate, jingle_session_get_local_jid(session), -1);
+	}
 	jabber_iq_set_callback(iq, jingle_s5b_proxy_activate_cb, data);
 	jabber_iq_send(iq);
 }


More information about the Commits mailing list