2 files changed, 9 insertions, 9 deletions
diff --git a/Swift/Controllers/Chat/ChatController.cpp b/Swift/Controllers/Chat/ChatController.cpp
index b6ca984..fe8e870 100644
--- a/Swift/Controllers/Chat/ChatController.cpp
+++ b/Swift/Controllers/Chat/ChatController.cpp
@@ -552,42 +552,42 @@ void ChatController::handleIncomingReplaceMessage(const JID& from, const ChatWin
     else {
         addMessageHandleIncomingMessage(from, message, messageID, senderIsSelf, label, timeStamp);
     }
 }
 
 void ChatController::logMessage(const std::string& message, const JID& fromJID, const JID& toJID, const boost::posix_time::ptime& timeStamp, bool /* isIncoming */) {
     HistoryMessage::Type type;
     if (mucRegistry_->isMUC(fromJID.toBare()) || mucRegistry_->isMUC(toJID.toBare())) {
         type = HistoryMessage::PrivateMessage;
     }
     else {
         type = HistoryMessage::Chat;
     }
 
     if (historyController_) {
         historyController_->addMessage(message, fromJID, toJID, type, timeStamp);
     }
 }
 
 bool ChatController::shouldIgnoreMessage(std::shared_ptr<Message> message) {
     if (!message->getID().empty()) {
         if (message->getID() == lastHandledMessageID_) {
             return true;
         }
         else {
             lastHandledMessageID_ = message->getID();
         }
     }
     return false;
 }
-    
+
 JID ChatController::messageCorrectionJID(const JID& fromJID) {
     return fromJID.toBare();
 }
 
 ChatWindow* ChatController::detachChatWindow() {
     chatWindow_->onUserTyping.disconnect(boost::bind(&ChatStateNotifier::setUserIsTyping, chatStateNotifier_));
     chatWindow_->onUserCancelsTyping.disconnect(boost::bind(&ChatStateNotifier::userCancelledNewMessage, chatStateNotifier_));
     return ChatControllerBase::detachChatWindow();
 }
 
 }
diff --git a/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp b/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp
index 8fc26b5..1502dc9 100644
--- a/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp
+++ b/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp
@@ -1255,93 +1255,93 @@ public:
             std::string forwardedBody = "Some text my other resource sent.";
             originalMessage->setBody(forwardedBody);
             originalMessage->addPayload(std::make_shared<DeliveryReceiptRequest>());
 
             auto messageWrapper = createCarbonsMessage(std::make_shared<CarbonsSent>(), originalMessage);
 
             manager_->handleIncomingMessage(messageWrapper);
 
             CPPUNIT_ASSERT_EQUAL(forwardedBody, MockChatWindow::bodyFromMessage(window->lastAddedMessage_));
             CPPUNIT_ASSERT_EQUAL(true, window->lastAddedMessageSenderIsSelf_);
             CPPUNIT_ASSERT_EQUAL(size_t(1), window->receiptChanges_.size());
             CPPUNIT_ASSERT_EQUAL(ChatWindow::ReceiptRequested, window->receiptChanges_[0].second);
         }
 
         // incoming carbons message for the received delivery receipt to the other resource
         {
             auto originalMessage = std::make_shared<Message>();
             originalMessage->setFrom(messageJID);
             originalMessage->setTo(jid2);
             originalMessage->setType(Message::Chat);
             originalMessage->addPayload(std::make_shared<DeliveryReceipt>("abcdefg123456"));
 
             auto messageWrapper = createCarbonsMessage(std::make_shared<CarbonsReceived>(), originalMessage);
 
             manager_->handleIncomingMessage(messageWrapper);
 
             CPPUNIT_ASSERT_EQUAL(size_t(2), window->receiptChanges_.size());
             CPPUNIT_ASSERT_EQUAL(ChatWindow::ReceiptReceived, window->receiptChanges_[1].second);
         }
     }
-    
+
     void testCarbonsForwardedIncomingDuplicates() {
         JID messageJID("testling@test.com/resource1");
         JID jid2 = jid_.toBare().withResource("someOtherResource");
-        
+
         MockChatWindow* window = new MockChatWindow();
         mocks_->ExpectCall(chatWindowFactory_, ChatWindowFactory::createChatWindow).With(messageJID, uiEventStream_).Return(window);
-        
+
         std::shared_ptr<Message> message(new Message());
         message->setFrom(messageJID);
         std::string body("This is a legible message. >HEH@)oeueu");
         message->setBody(body);
         manager_->handleIncomingMessage(message);
         CPPUNIT_ASSERT_EQUAL(body, MockChatWindow::bodyFromMessage(window->lastAddedMessage_));
-        
+
         // incoming carbons message from another resource and duplicate of it
         {
             auto originalMessage = std::make_shared<Message>();
             originalMessage->setFrom(messageJID);
             originalMessage->setTo(jid2);
             originalMessage->setID("BDD82F0B-2523-48BF-B8CA-17B23A314BC2");
             originalMessage->setType(Message::Chat);
             std::string forwardedBody = "Some further text.";
             originalMessage->setBody(forwardedBody);
-            
+
             auto messageWrapper = createCarbonsMessage(std::make_shared<CarbonsReceived>(), originalMessage);
-            
+
             manager_->handleIncomingMessage(messageWrapper);
-            
+
             CPPUNIT_ASSERT_EQUAL(forwardedBody, MockChatWindow::bodyFromMessage(window->lastAddedMessage_));
             CPPUNIT_ASSERT_EQUAL(false, window->lastAddedMessageSenderIsSelf_);
             window->resetLastMessages();
-            
+
             messageWrapper = createCarbonsMessage(std::make_shared<CarbonsReceived>(), originalMessage);
             manager_->handleIncomingMessage(messageWrapper);
             CPPUNIT_ASSERT_EQUAL(std::string(), MockChatWindow::bodyFromMessage(window->lastAddedMessage_));
             CPPUNIT_ASSERT_EQUAL(false, window->lastAddedMessageSenderIsSelf_);
         }
     }
 
     /**
      * This test case ensures correct handling of the ideal case where the replace
      * message refers to a message with a known ID. This results in the last
      * message being replaced.
      */
     void testChatControllerMessageCorrectionCorrectReplaceID() {
         JID messageJID("testling@test.com/resource1");
 
         MockChatWindow* window = new MockChatWindow();
         mocks_->ExpectCall(chatWindowFactory_, ChatWindowFactory::createChatWindow).With(messageJID, uiEventStream_).Return(window);
 
         auto message = std::make_shared<Message>();
         message->setFrom(messageJID);
         message->setTo(jid_);
         message->setType(Message::Chat);
         message->setBody("text before edit");
         message->setID("someID");
         manager_->handleIncomingMessage(message);
 
         CPPUNIT_ASSERT_EQUAL(std::string("text before edit"), MockChatWindow::bodyFromMessage(window->lastAddedMessage_));
 
         message = std::make_shared<Message>();
         message->setFrom(messageJID);