pidgin.2.6.5: 7107d360: *** Plucked rev 4356cc7feb044645d98b4ec0...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 7107d360f4e1e6e9915e9f9c7e84d5ede15837e3
Ancestor: 8399303c1520902107b5cdf263ddb926b0a450f0
Author: datallah at pidgin.im
Date: 2010-01-07T23:46:01
Branch: im.pidgin.pidgin.2.6.5
URL: http://d.pidgin.im/viewmtn/revision/info/7107d360f4e1e6e9915e9f9c7e84d5ede15837e3

Modified files:
        ChangeLog libpurple/protocols/jabber/si.c

ChangeLog: 

*** Plucked rev 4356cc7feb044645d98b4ec0ce70476371949c99 (f05c54b03e6bbfdbff38c01697fbd353a969e05e):
jabber: Fix file transfer with clients that don't support xep-0115.  Closes #10936


-------------- next part --------------
============================================================
--- ChangeLog	d2abf154d1199ea43cc4c31175427b2aaaac39d0
+++ ChangeLog	127e45f921be4d485dc7a77e4754f4c9057db3e8
@@ -11,6 +11,8 @@ version 2.6.5 (??/??/20??):
 
 	XMPP:
 	* Do not crash when attempting to register for a new account on Windows.
+	* Fix file transfer with clients that do not support Entity Capabilities
+	  (e.g. Spark)
 
 version 2.6.4 (11/29/2009):
 	libpurple:
============================================================
--- libpurple/protocols/jabber/si.c	24a86e00c7202943b57a97818e6b4b8ae025fd88
+++ libpurple/protocols/jabber/si.c	13949ab5a82892daaf7fe1935d00b76e8ad9a8ca
@@ -1448,7 +1448,7 @@ static void do_transfer_send(PurpleXfer 
 	g_free(xfer->who);
 	xfer->who = who;
 
-	if (jbr) {
+	if (jbr && jbr->caps.info) {
 		char *msg;
 
 		if (jabber_resource_has_capability(jbr, NS_IBB))