1 files changed, 50 insertions, 48 deletions
diff --git a/Swiften/FileTransfer/DefaultFileTransferTransporterFactory.cpp b/Swiften/FileTransfer/DefaultFileTransferTransporterFactory.cpp
index 4c8a55e..3af2cad 100644
--- a/Swiften/FileTransfer/DefaultFileTransferTransporterFactory.cpp
+++ b/Swiften/FileTransfer/DefaultFileTransferTransporterFactory.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2013 Remko Tronçon
- * Licensed under the GNU General Public License.
+ * Copyright (c) 2013-2015 Isode Limited.
+ * All rights reserved.
  * See the COPYING file for more information.
  */
 
@@ -11,22 +11,22 @@
 using namespace Swift;
 
 DefaultFileTransferTransporterFactory::DefaultFileTransferTransporterFactory(
-		SOCKS5BytestreamRegistry* s5bRegistry, 
-		SOCKS5BytestreamServerManager* s5bServerManager,
-		SOCKS5BytestreamProxiesManager* s5bProxiesManager, 
-		IDGenerator* idGenerator, 
-		ConnectionFactory* connectionFactory, 
-		TimerFactory* timerFactory, 
-		CryptoProvider* cryptoProvider,
-		IQRouter* iqRouter) :
-			s5bRegistry(s5bRegistry),
-			s5bServerManager(s5bServerManager),
-			s5bProxiesManager(s5bProxiesManager),
-			idGenerator(idGenerator),
-			connectionFactory(connectionFactory),
-			timerFactory(timerFactory),
-			cryptoProvider(cryptoProvider),
-			iqRouter(iqRouter)
+        SOCKS5BytestreamRegistry* s5bRegistry,
+        SOCKS5BytestreamServerManager* s5bServerManager,
+        SOCKS5BytestreamProxiesManager* s5bProxiesManager,
+        IDGenerator* idGenerator,
+        ConnectionFactory* connectionFactory,
+        TimerFactory* timerFactory,
+        CryptoProvider* cryptoProvider,
+        IQRouter* iqRouter) :
+            s5bRegistry(s5bRegistry),
+            s5bServerManager(s5bServerManager),
+            s5bProxiesManager(s5bProxiesManager),
+            idGenerator(idGenerator),
+            connectionFactory(connectionFactory),
+            timerFactory(timerFactory),
+            cryptoProvider(cryptoProvider),
+            iqRouter(iqRouter)
 {
 }
 
@@ -34,37 +34,39 @@ DefaultFileTransferTransporterFactory::~DefaultFileTransferTransporterFactory()
 }
 
 FileTransferTransporter* DefaultFileTransferTransporterFactory::createInitiatorTransporter(
-		const JID& initiator, const JID& responder) {
-	DefaultFileTransferTransporter* transporter = new DefaultFileTransferTransporter(
-		initiator, 
-		responder,
-		DefaultFileTransferTransporter::Initiator,
-		s5bRegistry,
-		s5bServerManager,
-		s5bProxiesManager,
-		idGenerator,
-		connectionFactory,
-		timerFactory,
-		cryptoProvider,
-		iqRouter);
-	transporter->initialize();
-	return transporter;
+        const JID& initiator, const JID& responder, const FileTransferOptions& options) {
+    DefaultFileTransferTransporter* transporter = new DefaultFileTransferTransporter(
+        initiator,
+        responder,
+        DefaultFileTransferTransporter::Initiator,
+        s5bRegistry,
+        s5bServerManager,
+        s5bProxiesManager,
+        idGenerator,
+        connectionFactory,
+        timerFactory,
+        cryptoProvider,
+        iqRouter,
+        options);
+    transporter->initialize();
+    return transporter;
 }
 
 FileTransferTransporter* DefaultFileTransferTransporterFactory::createResponderTransporter(
-		const JID& initiator, const JID& responder, const std::string& s5bSessionID) {
-	DefaultFileTransferTransporter* transporter = new DefaultFileTransferTransporter(
-		initiator, 
-		responder,
-		DefaultFileTransferTransporter::Initiator,
-		s5bRegistry,
-		s5bServerManager,
-		s5bProxiesManager,
-		idGenerator,
-		connectionFactory,
-		timerFactory,
-		cryptoProvider,
-		iqRouter);
-	transporter->initialize(s5bSessionID);
-	return transporter;
+        const JID& initiator, const JID& responder, const std::string& s5bSessionID, const FileTransferOptions& options) {
+    DefaultFileTransferTransporter* transporter = new DefaultFileTransferTransporter(
+        initiator,
+        responder,
+        DefaultFileTransferTransporter::Responder,
+        s5bRegistry,
+        s5bServerManager,
+        s5bProxiesManager,
+        idGenerator,
+        connectionFactory,
+        timerFactory,
+        cryptoProvider,
+        iqRouter,
+        options);
+    transporter->initialize(s5bSessionID);
+    return transporter;
 }