Swift
summaryrefslogtreecommitdiffstats
path: root/Swift/Controllers/Chat/ChatsManager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Swift/Controllers/Chat/ChatsManager.cpp')
-rw-r--r--Swift/Controllers/Chat/ChatsManager.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/Swift/Controllers/Chat/ChatsManager.cpp b/Swift/Controllers/Chat/ChatsManager.cpp
index 6530a7e..193af7f 100644
--- a/Swift/Controllers/Chat/ChatsManager.cpp
+++ b/Swift/Controllers/Chat/ChatsManager.cpp
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2010-2018 Isode Limited. 2 * Copyright (c) 2010-2019 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
@@ -175,7 +175,7 @@ ChatsManager::~ChatsManager() {
175 roster_->onRosterCleared.disconnect(boost::bind(&ChatsManager::handleRosterCleared, this)); 175 roster_->onRosterCleared.disconnect(boost::bind(&ChatsManager::handleRosterCleared, this));
176 ftOverview_->onNewFileTransferController.disconnect(boost::bind(&ChatsManager::handleNewFileTransferController, this, _1)); 176 ftOverview_->onNewFileTransferController.disconnect(boost::bind(&ChatsManager::handleNewFileTransferController, this, _1));
177 delete joinMUCWindow_; 177 delete joinMUCWindow_;
178 SWIFT_LOG(debug) << "Destroying ChatsManager, containing " << chatControllers_.size() << " chats and " << mucControllers_.size() << " MUCs" << std::endl; 178 SWIFT_LOG(debug) << "Destroying ChatsManager, containing " << chatControllers_.size() << " chats and " << mucControllers_.size() << " MUCs";
179 for (JIDChatControllerPair controllerPair : chatControllers_) { 179 for (JIDChatControllerPair controllerPair : chatControllers_) {
180 delete controllerPair.second; 180 delete controllerPair.second;
181 } 181 }
@@ -311,7 +311,7 @@ void ChatsManager::loadRecents() {
311 boost::archive::text_iarchive ia(deserializeStream); 311 boost::archive::text_iarchive ia(deserializeStream);
312 ia >> recentChats; 312 ia >> recentChats;
313 } catch (const boost::archive::archive_exception& e) { 313 } catch (const boost::archive::archive_exception& e) {
314 SWIFT_LOG(debug) << "Failed to load recents: " << e.what() << std::endl; 314 SWIFT_LOG(debug) << "Failed to load recents: " << e.what();
315 return; 315 return;
316 } 316 }
317 recentChats.erase(std::remove(recentChats.begin(), recentChats.end(), ChatListWindow::Chat()), recentChats.end()); 317 recentChats.erase(std::remove(recentChats.begin(), recentChats.end(), ChatListWindow::Chat()), recentChats.end());
@@ -936,7 +936,7 @@ void ChatsManager::handleUserNicknameChanged(MUCController* mucController, const
936 JID oldMUCChatJID = mucController->getToJID().withResource(oldNickname); 936 JID oldMUCChatJID = mucController->getToJID().withResource(oldNickname);
937 JID newMUCChatJID = mucController->getToJID().withResource(newNickname); 937 JID newMUCChatJID = mucController->getToJID().withResource(newNickname);
938 938
939 SWIFT_LOG(debug) << "nickname change in " << mucController->getToJID().toString() << " from " << oldNickname << " to " << newNickname << std::endl; 939 SWIFT_LOG(debug) << "nickname change in " << mucController->getToJID().toString() << " from " << oldNickname << " to " << newNickname;
940 940
941 // get current chat controller 941 // get current chat controller
942 ChatController *chatController = getChatControllerIfExists(oldMUCChatJID); 942 ChatController *chatController = getChatControllerIfExists(oldMUCChatJID);
@@ -983,7 +983,7 @@ void ChatsManager::handleIncomingMessage(std::shared_ptr<Message> incomingMessag
983 controller->handleIncomingOwnMessage(forwardedMessage); 983 controller->handleIncomingOwnMessage(forwardedMessage);
984 } 984 }
985 else { 985 else {
986 SWIFT_LOG(error) << "Carbons message ignored." << std::endl; 986 SWIFT_LOG(error) << "Carbons message ignored.";
987 } 987 }
988 return; 988 return;
989 } 989 }
@@ -1141,7 +1141,7 @@ void ChatsManager::handleLocalServiceFound(const JID& service, std::shared_ptr<D
1141 && identity.getType() == "text")) { 1141 && identity.getType() == "text")) {
1142 localMUCServiceJID_ = service; 1142 localMUCServiceJID_ = service;
1143 localMUCServiceFinderWalker_->endWalk(); 1143 localMUCServiceFinderWalker_->endWalk();
1144 SWIFT_LOG(debug) << "Use following MUC service for impromptu chats: " << localMUCServiceJID_ << std::endl; 1144 SWIFT_LOG(debug) << "Use following MUC service for impromptu chats: " << localMUCServiceJID_;
1145 break; 1145 break;
1146 } 1146 }
1147 } 1147 }