1 files changed, 7 insertions, 4 deletions
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index e80a863..55cc26d 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/QtUI/QtChatWindow.h>
 
@@ -66,13 +66,13 @@ QtChatWindow::QtChatWindow(const QString &contact, QtChatTheme* theme, UIEventSt
 	theme_ = theme;
 	isCorrection_ = false;
 	labelModel_ = NULL;
 	correctionEnabled_ = Maybe;
 	fileTransferEnabled_ = Maybe;
 	updateTitleWithUnreadCount();
-
+	assert(settings);
 #ifdef SWIFT_EXPERIMENTAL_FT
 	setAcceptDrops(true);
 #endif
 
 	alertStyleSheet_ = "background: rgb(255, 255, 153); color: black";
 
@@ -519,12 +519,15 @@ void QtChatWindow::flash() {
 }
 
 int QtChatWindow::getCount() {
 	return unreadCount_;
 }
 
+void QtChatWindow::replaceSystemMessage(const ChatWindow::ChatMessage& message, const std::string& id, const ChatWindow::TimestampBehaviour timestampBehaviour) {
+	messageLog_->replaceSystemMessage(message, id, timestampBehaviour);
+}
 
 void QtChatWindow::returnPressed() {
 	if (!isOnline_ || (blockingState_ == IsBlocked)) {
 		return;
 	}
 	messageLog_->scrollToBottom();
@@ -811,15 +814,15 @@ std::string QtChatWindow::addMessage(const ChatMessage& message, const std::stri
 std::string QtChatWindow::addAction(const ChatMessage& message, const std::string& senderName, bool senderIsSelf, boost::shared_ptr<SecurityLabel> label, const std::string& avatarPath, const boost::posix_time::ptime& time, const HighlightAction& highlight) {
 	handleAppendedToLog();
 	return messageLog_->addAction(message, senderName, senderIsSelf, label, avatarPath, time, highlight);
 }
 
 
-void QtChatWindow::addSystemMessage(const ChatMessage& message, Direction direction) {
+std::string QtChatWindow::addSystemMessage(const ChatMessage& message, Direction direction) {
 	handleAppendedToLog();
-	messageLog_->addSystemMessage(message, direction);
+	return messageLog_->addSystemMessage(message, direction);
 }
 
 void QtChatWindow::addPresenceMessage(const ChatMessage& message, Direction direction) {
 	handleAppendedToLog();
 	messageLog_->addPresenceMessage(message, direction);
 }