From 78ae057c543f4e272332430981eecd06850fbd96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Thu, 29 Sep 2011 22:29:29 +0200
Subject: Fixed check for F/T support used for enabling the "Send File" menu.

It was only checking for IBB, whereas it should have checked for IBB or
S5B.

diff --git a/Swiften/FileTransfer/FileTransferManagerImpl.cpp b/Swiften/FileTransfer/FileTransferManagerImpl.cpp
index 1bad9fb..445c7f0 100644
--- a/Swiften/FileTransfer/FileTransferManagerImpl.cpp
+++ b/Swiften/FileTransfer/FileTransferManagerImpl.cpp
@@ -81,8 +81,7 @@ boost::optional<JID> FileTransferManagerImpl::highestPriorityJIDSupportingFileTr
 		if (pres->getPriority() > priority) {
 			// look up caps from the jid
 			DiscoInfo::ref info = capsProvider->getCaps(pres->getFrom());
-			if (info && info->hasFeature(DiscoInfo::JingleFeature) && info->hasFeature(DiscoInfo::JingleFTFeature) &&
-				info->hasFeature(DiscoInfo::JingleTransportsIBBFeature)) {
+			if (info && info->hasFeature(DiscoInfo::JingleFeature) && info->hasFeature(DiscoInfo::JingleFTFeature) && (info->hasFeature(DiscoInfo::JingleTransportsIBBFeature) || info->hasFeature(DiscoInfo::JingleTransportsS5BFeature))) {
 			
 				priority = pres->getPriority();
 				fullReceipientJID = pres->getFrom();
-- 
cgit v0.10.2-6-g49f6