1 files changed, 21 insertions, 10 deletions
diff --git a/Swiften/FileTransfer/IncomingFileTransferManager.cpp b/Swiften/FileTransfer/IncomingFileTransferManager.cpp
index 22e8bf9..d40c5de 100644
--- a/Swiften/FileTransfer/IncomingFileTransferManager.cpp
+++ b/Swiften/FileTransfer/IncomingFileTransferManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -18,9 +18,17 @@
 
 namespace Swift {
 
-IncomingFileTransferManager::IncomingFileTransferManager(JingleSessionManager* jingleSessionManager, IQRouter* router,
-							RemoteJingleTransportCandidateSelectorFactory* remoteFactory,
-														 LocalJingleTransportCandidateGeneratorFactory* localFactory, SOCKS5BytestreamRegistry* bytestreamRegistry, SOCKS5BytestreamProxy* bytestreamProxy, TimerFactory* timerFactory) : jingleSessionManager(jingleSessionManager), router(router), remoteFactory(remoteFactory), localFactory(localFactory), bytestreamRegistry(bytestreamRegistry), bytestreamProxy(bytestreamProxy), timerFactory(timerFactory) {
+IncomingFileTransferManager::IncomingFileTransferManager(
+		JingleSessionManager* jingleSessionManager,
+		IQRouter* router,
+		FileTransferTransporterFactory* transporterFactory,
+		TimerFactory* timerFactory, 
+		CryptoProvider* crypto) : 
+			jingleSessionManager(jingleSessionManager), 
+			router(router), 
+			transporterFactory(transporterFactory),
+			timerFactory(timerFactory), 
+			crypto(crypto) {
 	jingleSessionManager->addIncomingSessionHandler(this);
 }
 
@@ -28,16 +36,19 @@ IncomingFileTransferManager::~IncomingFileTransferManager() {
 	jingleSessionManager->removeIncomingSessionHandler(this);
 }
 
-bool IncomingFileTransferManager::handleIncomingJingleSession(JingleSession::ref session, const std::vector<JingleContentPayload::ref>& contents, const JID& recipient) {
+bool IncomingFileTransferManager::handleIncomingJingleSession(
+		JingleSession::ref session, 
+		const std::vector<JingleContentPayload::ref>& contents, 
+		const JID& recipient) {
 	if (JingleContentPayload::ref content = Jingle::getContentWithDescription<JingleFileTransferDescription>(contents)) {
-		if (content->getTransport<JingleIBBTransportPayload>() || content->getTransport<JingleS5BTransportPayload>()) {
-
+		if (content->getTransport<JingleS5BTransportPayload>()) {
 			JingleFileTransferDescription::ref description = content->getDescription<JingleFileTransferDescription>();
-
 			if (description && description->getOffers().size() == 1) {
-				IncomingJingleFileTransfer::ref transfer = boost::make_shared<IncomingJingleFileTransfer>(recipient, session, content, remoteFactory, localFactory, router, bytestreamRegistry, bytestreamProxy, timerFactory);
+				IncomingJingleFileTransfer::ref transfer = boost::make_shared<IncomingJingleFileTransfer>(
+						recipient, session, content, transporterFactory, timerFactory, crypto);
 				onIncomingFileTransfer(transfer);
-			} else {
+			} 
+			else {
 				std::cerr << "Received a file-transfer request with no description or more than one file!" << std::endl;
 				session->sendTerminate(JinglePayload::Reason::FailedApplication);
 			}