Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-01-19 14:17:28 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-01-19 14:17:28 (GMT) |
| commit | 0ca3ea9a88acb5e2d42baa3a85d61495d72b7352 (patch) | |
| tree | fad2683919bad1eaae2b964f0aadf0e4a1ed440d /Swift/Controllers/Chat/ChatsManager.cpp | |
| parent | 3cca16eb9c7035af82209cf2db4c5efafd90f584 (diff) | |
| download | swift-0ca3ea9a88acb5e2d42baa3a85d61495d72b7352.zip swift-0ca3ea9a88acb5e2d42baa3a85d61495d72b7352.tar.bz2 | |
Reset impromptu support flag when logging off
Test-Information:
Added unit test verifying the expected behavior. It passes
on OS X 10.11.2.
Change-Id: I7531e313bf03dbea276f133db042ce26e6da4a53
Diffstat (limited to 'Swift/Controllers/Chat/ChatsManager.cpp')
| -rw-r--r-- | Swift/Controllers/Chat/ChatsManager.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Swift/Controllers/Chat/ChatsManager.cpp b/Swift/Controllers/Chat/ChatsManager.cpp index 48cdb29..1a69982 100644 --- a/Swift/Controllers/Chat/ChatsManager.cpp +++ b/Swift/Controllers/Chat/ChatsManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2015 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -690,6 +690,7 @@ void ChatsManager::setOnline(bool enabled) { markAllRecentsOffline(); } else { setupBookmarks(); + localMUCServiceJID_ = JID(); localMUCServiceFinderWalker_ = boost::make_shared<DiscoServiceWalker>(jid_.getDomain(), iqRouter_); localMUCServiceFinderWalker_->onServiceFound.connect(boost::bind(&ChatsManager::handleLocalServiceFound, this, _1, _2)); localMUCServiceFinderWalker_->onWalkAborted.connect(boost::bind(&ChatsManager::handleLocalServiceWalkFinished, this)); @@ -1004,7 +1005,14 @@ void ChatsManager::handleLocalServiceFound(const JID& service, boost::shared_ptr } void ChatsManager::handleLocalServiceWalkFinished() { - onImpromptuMUCServiceDiscovered(!localMUCServiceJID_.toString().empty()); + bool impromptuMUCSupported = !localMUCServiceJID_.toString().empty(); + foreach (JIDChatControllerPair controllerPair, chatControllers_) { + controllerPair.second->setCanStartImpromptuChats(impromptuMUCSupported); + } + foreach (JIDMUCControllerPair controllerPair, mucControllers_) { + controllerPair.second->setCanStartImpromptuChats(impromptuMUCSupported); + } + onImpromptuMUCServiceDiscovered(impromptuMUCSupported); } std::vector<ChatListWindow::Chat> ChatsManager::getRecentChats() const { |