2 files changed, 7 insertions, 6 deletions
diff --git a/Swift/Controllers/Chat/ChatController.cpp b/Swift/Controllers/Chat/ChatController.cpp
index 5602dcd..4352c8b 100644
--- a/Swift/Controllers/Chat/ChatController.cpp
+++ b/Swift/Controllers/Chat/ChatController.cpp
@@ -242,46 +242,46 @@ void ChatController::setOnline(bool online) {
 
 void ChatController::handleNewFileTransferController(FileTransferController* ftc) {
 	std::string nick = senderDisplayNameFromMessage(ftc->getOtherParty());
 	std::string ftID = ftc->setChatWindow(chatWindow_, nick);
 	
 	ftControllers[ftID] = ftc;
 }
 
 void ChatController::handleFileTransferCancel(std::string id) {
-	std::cout << "handleFileTransferCancel(" << id << ")" << std::endl;
+	SWIFT_LOG(debug) << "handleFileTransferCancel(" << id << ")" << std::endl;
 	if (ftControllers.find(id) != ftControllers.end()) {
 		ftControllers[id]->cancel();
 	} else {
 		std::cerr << "unknown file transfer UI id" << std::endl;
 	}
 }
 
 void ChatController::handleFileTransferStart(std::string id, std::string description) {
-	std::cout << "handleFileTransferStart(" << id << ", " << description << ")" << std::endl;
+	SWIFT_LOG(debug) << "handleFileTransferStart(" << id << ", " << description << ")" << std::endl;
 	if (ftControllers.find(id) != ftControllers.end()) {
 		ftControllers[id]->start(description);
 	} else {
 		std::cerr << "unknown file transfer UI id" << std::endl;
 	}
 }
 
 void ChatController::handleFileTransferAccept(std::string id, std::string filename) {
-	std::cout << "handleFileTransferAccept(" << id << ", " << filename << ")" << std::endl;
+	SWIFT_LOG(debug) "handleFileTransferAccept(" << id << ", " << filename << ")" << std::endl;
 	if (ftControllers.find(id) != ftControllers.end()) {
 		ftControllers[id]->accept(filename);
 	} else {
 		std::cerr << "unknown file transfer UI id" << std::endl;
 	}
 }
 
 void ChatController::handleSendFileRequest(std::string filename) {
-	std::cout << "ChatController::handleSendFileRequest(" << filename << ")" << std::endl;
+	SWIFT_LOG(debug) << "ChatController::handleSendFileRequest(" << filename << ")" << std::endl;
 	eventStream_->send(boost::make_shared<SendFileUIEvent>(getToJID(), filename));
 }
 
 std::string ChatController::senderDisplayNameFromMessage(const JID& from) {
 	return nickResolver_->jidToNick(from);
 }
 
 std::string ChatController::getStatusChangeString(boost::shared_ptr<Presence> presence) {
 	std::string nick = senderDisplayNameFromMessage(presence->getFrom());
diff --git a/Swift/Controllers/FileTransfer/FileTransferController.cpp b/Swift/Controllers/FileTransfer/FileTransferController.cpp
index afa907d..f1fd19e 100644
--- a/Swift/Controllers/FileTransfer/FileTransferController.cpp
+++ b/Swift/Controllers/FileTransfer/FileTransferController.cpp
@@ -5,18 +5,19 @@
  */
 
 #include "FileTransferController.h"
 #include "Swiften/FileTransfer/OutgoingJingleFileTransfer.h"
 #include "Swiften/FileTransfer/FileTransferManager.h"
 #include <Swiften/FileTransfer/FileReadBytestream.h>
 #include <Swiften/Base/boost_bsignals.h>
 #include <boost/bind.hpp>
 #include "Swift/Controllers/UIInterfaces/ChatWindow.h"
+#include <Swiften/Base/Log.h>
 
 #include <boost/smart_ptr/make_shared.hpp>
 
 namespace Swift {
 
 FileTransferController::FileTransferController(const JID& receipient, const std::string& filename, FileTransferManager* fileTransferManager) :
 	sending(true), otherParty(receipient), filename(filename), ftManager(fileTransferManager), ftProgressInfo(0), chatWindow(0), currentState(FileTransfer::State::WaitingForStart) {
 	
 }
@@ -63,35 +64,35 @@ int FileTransferController::getProgress() const {
 boost::uintmax_t FileTransferController::getSize() const {
 	if (transfer) {
 		return transfer->fileSizeInBytes;
 	} else {
 		return 0;
 	}
 }
 
 void FileTransferController::start(std::string& description) {
-	std::cout << "FileTransferController::start" << std::endl;
+	SWIFT_LOG("DEBUG") << "FileTransferController::start" << std::endl;
 	fileReadStream = boost::make_shared<FileReadBytestream>(boost::filesystem::path(filename));
 	OutgoingFileTransfer::ref outgoingTransfer = ftManager->createOutgoingFileTransfer(otherParty, boost::filesystem::path(filename), description, fileReadStream);
 	if (outgoingTransfer) {
 		ftProgressInfo = new FileTransferProgressInfo(outgoingTransfer->fileSizeInBytes);
 		ftProgressInfo->onProgressPercentage.connect(boost::bind(&FileTransferController::handleProgressPercentageChange, this, _1));
 		outgoingTransfer->onStateChange.connect(boost::bind(&FileTransferController::handleFileTransferStateChange, this, _1));
 		outgoingTransfer->onProcessedBytes.connect(boost::bind(&FileTransferProgressInfo::setBytesProcessed, ftProgressInfo, _1));
 		outgoingTransfer->start();
 		transfer = outgoingTransfer;
 	} else {
 		std::cerr << "File transfer not supported!" << std::endl;
 	}
 }
 
 void FileTransferController::accept(std::string& file) {
-	std::cout << "FileTransferController::accept" << std::endl;
+	SWIFT_LOG("DEBUG") << "FileTransferController::accept" << std::endl;
 	IncomingFileTransfer::ref incomingTransfer = boost::dynamic_pointer_cast<IncomingFileTransfer>(transfer);
 	if (incomingTransfer) {
 		fileWriteStream = boost::make_shared<FileWriteBytestream>(boost::filesystem::path(file));
 
 		ftProgressInfo = new FileTransferProgressInfo(transfer->fileSizeInBytes);
 		ftProgressInfo->onProgressPercentage.connect(boost::bind(&FileTransferController::handleProgressPercentageChange, this, _1));
 		transfer->onStateChange.connect(boost::bind(&FileTransferController::handleFileTransferStateChange, this, _1));
 		transfer->onProcessedBytes.connect(boost::bind(&FileTransferProgressInfo::setBytesProcessed, ftProgressInfo, _1));
 		incomingTransfer->accept(fileWriteStream);