1 files changed, 1 insertions, 2 deletions
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
@@ -79,72 +79,71 @@ FileTransferManagerImpl::FileTransferManagerImpl(
 	incomingFTManager = new IncomingFileTransferManager(
 			jingleSessionManager, 
 			iqRouter, 
 			transporterFactory,
 			timerFactory,
 			crypto);
 	incomingFTManager->onIncomingFileTransfer.connect(onIncomingFileTransfer);
 }
 
 FileTransferManagerImpl::~FileTransferManagerImpl() {
 	delete s5bServerManager;
 	delete incomingFTManager;
 	delete outgoingFTManager;
 	delete transporterFactory;
 }
 
 void FileTransferManagerImpl::start() {
 }
 
 void FileTransferManagerImpl::stop() {
 	s5bServerManager->stop();
 }
 
 boost::optional<JID> FileTransferManagerImpl::highestPriorityJIDSupportingFileTransfer(const JID& bareJID) {
 	JID fullReceipientJID;
 	int priority = INT_MIN;
 	
 	//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>();
 }
 
 OutgoingFileTransfer::ref FileTransferManagerImpl::createOutgoingFileTransfer(
 		const JID& to, 
 		const boost::filesystem::path& filepath, 
 		const std::string& description, 
 		boost::shared_ptr<ReadBytestream> bytestream,
 		const FileTransferOptions& config) {
 #if BOOST_FILESYSTEM_VERSION == 2 // TODO: Delete this when boost 1.44 becomes a minimum requirement, and we no longer need v2
 	std::string filename = filepath.filename();
 #else
 	std::string filename = pathToString(filepath.filename());
 #endif
 
 	boost::uintmax_t sizeInBytes = boost::filesystem::file_size(filepath);
 	boost::posix_time::ptime lastModified = boost::posix_time::from_time_t(boost::filesystem::last_write_time(filepath));
 	return createOutgoingFileTransfer(to, filename, description, sizeInBytes, lastModified, bytestream, config);
 }
 
 OutgoingFileTransfer::ref FileTransferManagerImpl::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& config) {
 	StreamInitiationFileInfo fileInfo;