3 files changed, 13 insertions, 2 deletions
diff --git a/Swiften/FileTransfer/FileTransferManager.cpp b/Swiften/FileTransfer/FileTransferManager.cpp
index 69be852..0c7d894 100644
--- a/Swiften/FileTransfer/FileTransferManager.cpp
+++ b/Swiften/FileTransfer/FileTransferManager.cpp
@@ -5,10 +5,19 @@
  */
 
 #include <Swiften/FileTransfer/FileTransferManager.h>
 
 namespace Swift {
 
 FileTransferManager::~FileTransferManager() {
 }
 
+bool FileTransferManager::isSupportedBy(const DiscoInfo::ref info) {
+	if (info) {
+		return info->hasFeature(DiscoInfo::JingleFeature)
+						&& info->hasFeature(DiscoInfo::JingleFTFeature)
+						&& (info->hasFeature(DiscoInfo::JingleTransportsIBBFeature) || info->hasFeature(DiscoInfo::JingleTransportsS5BFeature));
+	}
+	return false;
+}
+
 }
diff --git a/Swiften/FileTransfer/FileTransferManager.h b/Swiften/FileTransfer/FileTransferManager.h
index 3b793c5..bc6530b 100644
--- a/Swiften/FileTransfer/FileTransferManager.h
+++ b/Swiften/FileTransfer/FileTransferManager.h
@@ -12,18 +12,19 @@
 
 #pragma once
 
 #include <string>
 #include <boost/filesystem/path.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/boost_bsignals.h>
+#include <Swiften/Elements/DiscoInfo.h>
 #include <Swiften/JID/JID.h>
 #include <Swiften/FileTransfer/FileTransferOptions.h>
 #include <Swiften/FileTransfer/OutgoingFileTransfer.h>
 #include <Swiften/FileTransfer/IncomingFileTransfer.h>
 
 namespace Swift {
 	class ReadBytestream;
 
 	class SWIFTEN_API FileTransferManager {
@@ -39,12 +40,14 @@ namespace Swift {
 			virtual OutgoingFileTransfer::ref createOutgoingFileTransfer(
 					const JID& to, 
 					const std::string& filename, 
 					const std::string& description, 
 					const boost::uintmax_t sizeInBytes, 
 					const boost::posix_time::ptime& lastModified, 
 					boost::shared_ptr<ReadBytestream> bytestream,
 					const FileTransferOptions& = FileTransferOptions()) = 0;
 			
+			static bool isSupportedBy(const DiscoInfo::ref info);
+
 			boost::signal<void (IncomingFileTransfer::ref)> onIncomingFileTransfer;
 	};
 }
diff --git a/Swiften/FileTransfer/FileTransferManagerImpl.cpp b/Swiften/FileTransfer/FileTransferManagerImpl.cpp
index b832d7e..04a2332 100644
--- a/Swiften/FileTransfer/FileTransferManagerImpl.cpp
+++ b/Swiften/FileTransfer/FileTransferManagerImpl.cpp
@@ -105,20 +105,19 @@ boost::optional<JID> FileTransferManagerImpl::highestPriorityJIDSupportingFileTr
 	
 	//getAllPresence(bareJID) gives you all presences for the bare JID (i.e. all resources) Remko Tronçon @ 11:11
 	std::vector<Presence::ref> presences = presenceOracle->getAllPresence(bareJID);
 
 	//iterate over them
 	foreach(Presence::ref pres, presences) {
 		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) || info->hasFeature(DiscoInfo::JingleTransportsS5BFeature))) {
-			
+			if (isSupportedBy(info)) {
 				priority = pres->getPriority();
 				fullReceipientJID = pres->getFrom();
 			}
 		}
 	}
 	
 	return fullReceipientJID.isValid() ? boost::optional<JID>(fullReceipientJID) : boost::optional<JID>();
 }