cpw.malu.xmpp.jingle_ft: 2804e079: Fixup namespaces stuff from merge

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 2804e079dabcf7bd4515349ad7b5a2c4ab7ddc7a
Ancestor: 43322e00f4a4b1c672054b602c7718beb17c053d
Author: malu at pidgin.im
Date: 2009-11-29T18:39:39
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/2804e079dabcf7bd4515349ad7b5a2c4ab7ddc7a

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

ChangeLog: 

Fixup namespaces stuff from merge

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c	8123bb3013904d4c0241099797f536409ea3964e
+++ libpurple/protocols/jabber/jabber.c	4dd773a7636b374c747e01d4db25fac1dc3a9d5b
@@ -3268,15 +3268,12 @@ gboolean jabber_can_receive_file(PurpleC
 						"http://jabber.org/protocol/si/profile/file-transfer")
 			    	&& (jabber_resource_has_capability(jbr,
 			    			NS_BYTESTREAMS)
-			        	|| jabber_resource_has_capability(jbr, NS_IBB))) {
-			    			"http://jabber.org/protocol/bytestreams")
-			        	|| jabber_resource_has_capability(jbr,
-				           		XEP_0047_NAMESPACE)))
+			        	|| jabber_resource_has_capability(jbr, NS_IBB))
 				    || (jabber_resource_has_capability(jbr, JINGLE_APP_FT)
 				        && (jabber_resource_has_capability(jbr,
 				            	JINGLE_TRANSPORT_S5B)
 				            || jabber_resource_has_capability(jbr,
-				               		JINGLE_TRANSPORT_IBB)))) {
+				               		JINGLE_TRANSPORT_IBB))))) {
 					return TRUE;
 				}
 			}