2 files changed, 7 insertions, 3 deletions
diff --git a/Swiften/Client/Client.cpp b/Swiften/Client/Client.cpp
index 323bb43..d2f8b7a 100644
--- a/Swiften/Client/Client.cpp
+++ b/Swiften/Client/Client.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2010-2012 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Client/Client.h>
 
@@ -83,12 +83,13 @@ Client::Client(const JID& jid, const SafeString& password, NetworkFactories* net
 
 Client::~Client() {
 	delete pubsubManager;
 	delete whiteboardSessionManager;
 
 	delete fileTransferManager;
+	delete blockListManager;
 	delete jingleSessionManager;
 	
 	delete blindCertificateTrustChecker;
 
 	delete nickResolver;
 	delete nickManager;
@@ -122,12 +123,13 @@ XMPPRoster* Client::getRoster() const {
 
 void Client::setSoftwareVersion(const std::string& name, const std::string& version, const std::string& os) {
 	softwareVersionResponder->setVersion(name, version, os);
 }
 
 void Client::handleConnected() {
+	delete fileTransferManager;
 #ifdef SWIFT_EXPERIMENTAL_FT
 	fileTransferManager = new FileTransferManagerImpl(
 			getJID(), 
 			jingleSessionManager, 
 			getIQRouter(), 
 			getEntityCapsProvider(), 
diff --git a/Swiften/FileTransfer/FileTransferManagerImpl.cpp b/Swiften/FileTransfer/FileTransferManagerImpl.cpp
index fe8bfd6..f439197 100644
--- a/Swiften/FileTransfer/FileTransferManagerImpl.cpp
+++ b/Swiften/FileTransfer/FileTransferManagerImpl.cpp
@@ -2,13 +2,13 @@
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
- * Copyright (c) 2013-2014 Isode Limited.
+ * Copyright (c) 2013-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/FileTransfer/FileTransferManagerImpl.h>
 
@@ -83,16 +83,18 @@ FileTransferManagerImpl::FileTransferManagerImpl(
 			timerFactory,
 			crypto);
 	incomingFTManager->onIncomingFileTransfer.connect(onIncomingFileTransfer);
 }
 
 FileTransferManagerImpl::~FileTransferManagerImpl() {
-	delete s5bServerManager;
 	delete incomingFTManager;
 	delete outgoingFTManager;
 	delete transporterFactory;
+	delete bytestreamProxy;
+	delete s5bServerManager;
+	delete bytestreamRegistry;
 }
 
 void FileTransferManagerImpl::start() {
 }
 
 void FileTransferManagerImpl::stop() {