cpw.malu.xmpp.jingle_ft: 90452c48: Add the jingle ft caps when determining ...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 90452c488a9c2660b74c9c6d9f0c14aec726e9c6
Ancestor: caf5feee2bbe81d86e427174a991faa5baa2f323
Author: malu at pidgin.im
Date: 2009-11-17T20:22:59
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/90452c488a9c2660b74c9c6d9f0c14aec726e9c6

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

ChangeLog: 

Add the jingle ft caps when determining if a buddy can receive a file

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c	9fc06f6db64262a079991a15b2e1fcd8cd2b39c4
+++ libpurple/protocols/jabber/jabber.c	f673c4614e3ef176d859e9e27a9daf6aa6c70f71
@@ -3253,12 +3253,17 @@ gboolean jabber_can_receive_file(PurpleC
 			for (iter = jb->resources; iter ; iter = g_list_next(iter)) {
 				JabberBuddyResource *jbr = (JabberBuddyResource *) iter->data;
 
-				if (jabber_resource_has_capability(jbr,
+				if ((jabber_resource_has_capability(jbr,
 						"http://jabber.org/protocol/si/profile/file-transfer")
 			    	&& (jabber_resource_has_capability(jbr,
 			    			"http://jabber.org/protocol/bytestreams")
 			        	|| jabber_resource_has_capability(jbr,
-				           		XEP_0047_NAMESPACE))) {
+				           		XEP_0047_NAMESPACE)))
+				    || (jabber_resource_has_capability(jbr, JINGLE_APP_FT)
+				        && (jabber_resource_has_capability(jbr,
+				            	JINGLE_TRANSPORT_S5B)
+				            || jabber_resource_has_capability(jbr,
+				               		JINGLE_TRANSPORT_IBB)))) {
 					return TRUE;
 				}
 			}