summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2013-02-03 18:21:12 (GMT)
committerRemko Tronçon <git@el-tramo.be>2013-02-05 20:26:22 (GMT)
commitb3a803ed132b5f1b7a21130c5466a8deb106d193 (patch)
treebd50171aa0384f9308efd920b720b83226c6d5f9 /Swift
parent28c99a37d09a68ef993330b9ece2732ec03eba8f (diff)
downloadswift-b3a803ed132b5f1b7a21130c5466a8deb106d193.zip
swift-b3a803ed132b5f1b7a21130c5466a8deb106d193.tar.bz2
Make logging thread-safe.
Change-Id: Ifab368474bd9e42e10f2cb0c29ff696c0aeaf3ea
Diffstat (limited to 'Swift')
-rw-r--r--Swift/Controllers/Chat/ChatController.cpp2
-rw-r--r--Swift/QtUI/QtSwift.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/Swift/Controllers/Chat/ChatController.cpp b/Swift/Controllers/Chat/ChatController.cpp
index 0ffef0c..edd2e3b 100644
--- a/Swift/Controllers/Chat/ChatController.cpp
+++ b/Swift/Controllers/Chat/ChatController.cpp
@@ -291,7 +291,7 @@ void ChatController::handleFileTransferStart(std::string id, std::string descrip
}
void ChatController::handleFileTransferAccept(std::string id, std::string filename) {
- SWIFT_LOG(debug) "handleFileTransferAccept(" << id << ", " << filename << ")" << std::endl;
+ SWIFT_LOG(debug) << "handleFileTransferAccept(" << id << ", " << filename << ")" << std::endl;
if (ftControllers.find(id) != ftControllers.end()) {
ftControllers[id]->accept(filename);
} else {
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp
index 4d10956..515c83f 100644
--- a/Swift/QtUI/QtSwift.cpp
+++ b/Swift/QtUI/QtSwift.cpp
@@ -153,7 +153,7 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa
}
if (options.count("debug")) {
- Swift::logging = true;
+ Log::setLogLevel(Swift::Log::debug);
}
tabs_ = options.count("no-tabs") && !splitter_ ? NULL : new QtChatTabs();