diff --git a/include/Swiften/FileTransfer/MyOutgoingSIFileTransfer.cpp b/include/Swiften/FileTransfer/MyOutgoingSIFileTransfer.cpp
index 394cec09dc3dbe590fbca9bee5b319d4ce4c302e..023d809693e004de5ef9855e3c3ba963986c2fb6 100644
--- a/include/Swiften/FileTransfer/MyOutgoingSIFileTransfer.cpp
+++ b/include/Swiften/FileTransfer/MyOutgoingSIFileTransfer.cpp
@@ -1,111 +1,118 @@
-/*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
- */
-
-#include <Swiften/FileTransfer/MyOutgoingSIFileTransfer.h>
-
-#include <boost/bind.hpp>
-
-#include <Swiften/FileTransfer/StreamInitiationRequest.h>
-#include <Swiften/FileTransfer/BytestreamsRequest.h>
-#include <Swiften/FileTransfer/SOCKS5BytestreamServer.h>
-#include <Swiften/FileTransfer/SOCKS5BytestreamRegistry.h>
-#include <Swiften/FileTransfer/IBBSendSession.h>
-
-namespace Swift {
-
-MyOutgoingSIFileTransfer::MyOutgoingSIFileTransfer(const std::string& id, const JID& from, const JID& to, const std::string& name, int size, const std::string& description, boost::shared_ptr<ReadBytestream> bytestream, IQRouter* iqRouter, SOCKS5BytestreamServer* socksServer, SOCKS5BytestreamRegistry* registry) : id(id), from(from), to(to), name(name), size(size), description(description), bytestream(bytestream), iqRouter(iqRouter), socksServer(socksServer), registry(registry) {
-}
-
-void MyOutgoingSIFileTransfer::start() {
-	StreamInitiation::ref streamInitiation(new StreamInitiation());
-	streamInitiation->setID(id);
-	streamInitiation->setFileInfo(StreamInitiationFileInfo(name, description, size));
-	streamInitiation->addProvidedMethod("http://jabber.org/protocol/bytestreams");
-	streamInitiation->addProvidedMethod("http://jabber.org/protocol/ibb");
-	StreamInitiationRequest::ref request = StreamInitiationRequest::create(from, to, streamInitiation, iqRouter);
-	request->onResponse.connect(boost::bind(&MyOutgoingSIFileTransfer::handleStreamInitiationRequestResponse, this, _1, _2));
-	request->send();
-}
-
-void MyOutgoingSIFileTransfer::stop() {
-}
-
-void MyOutgoingSIFileTransfer::cancel() {
-	// TODO
-// 	session->sendTerminate(JinglePayload::Reason::Cancel);
-
-	if (ibbSession) {
-		ibbSession->stop();
-	}
-	SOCKS5BytestreamServerSession *serverSession = registry->getConnectedSession(SOCKS5BytestreamRegistry::getHostname(id, from, to));
-	if (serverSession) {
-		serverSession->stop();
-	}
-
-	onStateChange(FileTransfer::State(FileTransfer::State::Canceled));
-}
-
-void MyOutgoingSIFileTransfer::handleStreamInitiationRequestResponse(StreamInitiation::ref response, ErrorPayload::ref error) {
-	if (error) {
-		finish(FileTransferError());
-	}
-	else {
-		if (response->getRequestedMethod() == "http://jabber.org/protocol/bytestreams") {
-			registry->addReadBytestream(SOCKS5BytestreamRegistry::getHostname(id, from, to), bytestream);
-			socksServer->addReadBytestream(id, from, to, bytestream);
-			Bytestreams::ref bytestreams(new Bytestreams());
-			bytestreams->setStreamID(id);
-			HostAddressPort addressPort = socksServer->getAddressPort();
-			bytestreams->addStreamHost(Bytestreams::StreamHost(addressPort.getAddress().toString(), from, addressPort.getPort()));
-			BytestreamsRequest::ref request = BytestreamsRequest::create(from, to, bytestreams, iqRouter);
-			request->onResponse.connect(boost::bind(&MyOutgoingSIFileTransfer::handleBytestreamsRequestResponse, this, _1, _2));
-			request->send();
-		}
-		else if (response->getRequestedMethod() == "http://jabber.org/protocol/ibb") {
-			ibbSession = boost::shared_ptr<IBBSendSession>(new IBBSendSession(id, from, to, bytestream, iqRouter));
-			ibbSession->onFinished.connect(boost::bind(&MyOutgoingSIFileTransfer::handleIBBSessionFinished, this, _1));
-			ibbSession->start();
-
-			onStateChange(FileTransfer::State(FileTransfer::State::Transferring));
-		}
-	}
-}
-
-void MyOutgoingSIFileTransfer::handleBytestreamsRequestResponse(Bytestreams::ref, ErrorPayload::ref error) {
-	if (error) {
-		finish(FileTransferError());
-		return;
-	}
-
-	SOCKS5BytestreamServerSession *serverSession = registry->getConnectedSession(SOCKS5BytestreamRegistry::getHostname(id, from, to));
-// 	serverSession->onBytesSent.connect(boost::bind(boost::ref(onProcessedBytes), _1));
-// 	serverSession->onFinished.connect(boost::bind(&OutgoingJingleFileTransfer::handleTransferFinished, this, _1));
-	serverSession->startTransfer();
-	onStateChange(FileTransfer::State(FileTransfer::State::Transferring));
-	
-	//socksServer->onTransferFinished.connect();
-}
-
-void MyOutgoingSIFileTransfer::finish(boost::optional<FileTransferError> error) {
-	if (ibbSession) {
-		ibbSession->onFinished.disconnect(boost::bind(&MyOutgoingSIFileTransfer::handleIBBSessionFinished, this, _1));
-		ibbSession.reset();
-	}
-	socksServer->removeReadBytestream(id, from, to);
-	if(error) {
-		onStateChange(FileTransfer::State(FileTransfer::State::Canceled));
-	}
-	else {
-		onStateChange(FileTransfer::State(FileTransfer::State::Finished));
-	}
-	onFinished(error);
-}
-
-void MyOutgoingSIFileTransfer::handleIBBSessionFinished(boost::optional<FileTransferError> error) {
-	finish(error);
-}
-
-}
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include <Swiften/FileTransfer/MyOutgoingSIFileTransfer.h>
+
+#include <boost/bind.hpp>
+
+#include <Swiften/FileTransfer/StreamInitiationRequest.h>
+#include <Swiften/FileTransfer/BytestreamsRequest.h>
+#include <Swiften/FileTransfer/SOCKS5BytestreamServer.h>
+#include <Swiften/FileTransfer/SOCKS5BytestreamRegistry.h>
+#include <Swiften/FileTransfer/IBBSendSession.h>
+
+namespace Swift {
+
+MyOutgoingSIFileTransfer::MyOutgoingSIFileTransfer(const std::string& id, const JID& from, const JID& to, const std::string& name, int size, const std::string& description, boost::shared_ptr<ReadBytestream> bytestream, IQRouter* iqRouter, SOCKS5BytestreamServer* socksServer, SOCKS5BytestreamRegistry* registry) : id(id), from(from), to(to), name(name), size(size), description(description), bytestream(bytestream), iqRouter(iqRouter), socksServer(socksServer), registry(registry) {
+}
+
+void MyOutgoingSIFileTransfer::start() {
+	StreamInitiation::ref streamInitiation(new StreamInitiation());
+	streamInitiation->setID(id);
+	streamInitiation->setFileInfo(StreamInitiationFileInfo(name, description, size));
+	streamInitiation->addProvidedMethod("http://jabber.org/protocol/bytestreams");
+	streamInitiation->addProvidedMethod("http://jabber.org/protocol/ibb");
+	StreamInitiationRequest::ref request = StreamInitiationRequest::create(from, to, streamInitiation, iqRouter);
+	request->onResponse.connect(boost::bind(&MyOutgoingSIFileTransfer::handleStreamInitiationRequestResponse, this, _1, _2));
+	request->send();
+}
+
+void MyOutgoingSIFileTransfer::stop() {
+}
+
+void MyOutgoingSIFileTransfer::cancel() {
+	// TODO
+// 	session->sendTerminate(JinglePayload::Reason::Cancel);
+
+	if (ibbSession) {
+		ibbSession->stop();
+	}
+#if !HAVE_SWIFTEN_3
+	SOCKS5BytestreamServerSession *serverSession = registry->getConnectedSession(SOCKS5BytestreamRegistry::getHostname(id, from, to));
+	if (serverSession) {
+		serverSession->stop();
+	}
+
+	onStateChange(FileTransfer::State(FileTransfer::State::Canceled));
+#endif
+}
+
+void MyOutgoingSIFileTransfer::handleStreamInitiationRequestResponse(StreamInitiation::ref response, ErrorPayload::ref error) {
+	if (error) {
+		finish(FileTransferError());
+	}
+	else {
+		if (response->getRequestedMethod() == "http://jabber.org/protocol/bytestreams") {
+#if !HAVE_SWIFTEN_3
+			registry->addReadBytestream(SOCKS5BytestreamRegistry::getHostname(id, from, to), bytestream);
+			socksServer->addReadBytestream(id, from, to, bytestream);
+#endif
+			Bytestreams::ref bytestreams(new Bytestreams());
+			bytestreams->setStreamID(id);
+			HostAddressPort addressPort = socksServer->getAddressPort();
+			bytestreams->addStreamHost(Bytestreams::StreamHost(addressPort.getAddress().toString(), from, addressPort.getPort()));
+			BytestreamsRequest::ref request = BytestreamsRequest::create(from, to, bytestreams, iqRouter);
+			request->onResponse.connect(boost::bind(&MyOutgoingSIFileTransfer::handleBytestreamsRequestResponse, this, _1, _2));
+			request->send();
+		}
+		else if (response->getRequestedMethod() == "http://jabber.org/protocol/ibb") {
+			ibbSession = boost::shared_ptr<IBBSendSession>(new IBBSendSession(id, from, to, bytestream, iqRouter));
+			ibbSession->onFinished.connect(boost::bind(&MyOutgoingSIFileTransfer::handleIBBSessionFinished, this, _1));
+			ibbSession->start();
+#if !HAVE_SWIFTEN_3
+			onStateChange(FileTransfer::State(FileTransfer::State::Transferring));
+#endif
+		}
+	}
+}
+
+void MyOutgoingSIFileTransfer::handleBytestreamsRequestResponse(Bytestreams::ref, ErrorPayload::ref error) {
+	if (error) {
+		finish(FileTransferError());
+		return;
+	}
+#if !HAVE_SWIFTEN_3
+	SOCKS5BytestreamServerSession *serverSession = registry->getConnectedSession(SOCKS5BytestreamRegistry::getHostname(id, from, to));
+// 	serverSession->onBytesSent.connect(boost::bind(boost::ref(onProcessedBytes), _1));
+// 	serverSession->onFinished.connect(boost::bind(&OutgoingJingleFileTransfer::handleTransferFinished, this, _1));
+	serverSession->startTransfer();
+	onStateChange(FileTransfer::State(FileTransfer::State::Transferring));
+#endif	
+	//socksServer->onTransferFinished.connect();
+}
+
+void MyOutgoingSIFileTransfer::finish(boost::optional<FileTransferError> error) {
+	if (ibbSession) {
+		ibbSession->onFinished.disconnect(boost::bind(&MyOutgoingSIFileTransfer::handleIBBSessionFinished, this, _1));
+		ibbSession.reset();
+	}
+#if !HAVE_SWIFTEN_3
+	socksServer->removeReadBytestream(id, from, to);
+	if(error) {
+		onStateChange(FileTransfer::State(FileTransfer::State::Canceled));
+	}
+	else {
+		onStateChange(FileTransfer::State(FileTransfer::State::Finished));
+	}
+#endif
+	onFinished(error);
+}
+
+void MyOutgoingSIFileTransfer::handleIBBSessionFinished(boost::optional<FileTransferError> error) {
+	finish(error);
+}
+
+}