summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Burgess <pete.burgess@isode.com>2018-03-13 16:13:23 (GMT)
committerPeter Burgess <pete.burgess@isode.com>2018-03-13 16:13:23 (GMT)
commitc8e14baa975d929941fe3d7dabd77667505c3f2b (patch)
tree3464b3f8cb186348e582342c5819c4e21a6316b8 /Swift/Controllers
parentc57ffc95daa7e9fef8663979d01b08a122447ba4 (diff)
downloadswift-c8e14baa975d929941fe3d7dabd77667505c3f2b.zip
swift-c8e14baa975d929941fe3d7dabd77667505c3f2b.tar.bz2
Tiny fix adding #ifdef to call to logMessage()
In ChatControllerBase::handleIncomingMessage(), there is a call to logMessage() that should have been wrapped in "#ifdef SWIFT_EXPERIMENTAL_HISTORY", and now it is. Test-information Unit tests still pass, swift still runs as expected. Change-Id: Ia985565d496d73a5c6fed5ce79390b7b0a4b0551
Diffstat (limited to 'Swift/Controllers')
-rw-r--r--Swift/Controllers/Chat/ChatControllerBase.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/Swift/Controllers/Chat/ChatControllerBase.cpp b/Swift/Controllers/Chat/ChatControllerBase.cpp
index 2ef91fa..f514346 100644
--- a/Swift/Controllers/Chat/ChatControllerBase.cpp
+++ b/Swift/Controllers/Chat/ChatControllerBase.cpp
@@ -306,7 +306,9 @@ void ChatControllerBase::handleIncomingMessage(std::shared_ptr<MessageEvent> mes
addMessageHandleIncomingMessage(from, chatMessage, message->getID(), senderIsSelf, label, timeStamp);
}
+#ifdef SWIFT_EXPERIMENTAL_HISTORY
logMessage(body, from, selfJID_, timeStamp, true);
+#endif
}
chatWindow_->show();
updateMessageCount();