Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-08-04 18:55:18 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-08-11 10:27:47 (GMT) |
| commit | 88dbda0ca538b30e0b001344fbcf8a36ff1abe1a (patch) | |
| tree | c8cc137aa4bbdc46403327a394651665b7459cb2 /Swift | |
| parent | 4d82839a2be335bbc4317ed802cb89dc7f03564e (diff) | |
| download | swift-88dbda0ca538b30e0b001344fbcf8a36ff1abe1a.zip swift-88dbda0ca538b30e0b001344fbcf8a36ff1abe1a.tar.bz2 | |
Fix broken bookmarks context menu after reconnect
Test-Information:
Tested that the bookmarks context menu still works after an
offline/online cycle.
Change-Id: I9248b7405a6a09bc813c6590e0f2f9a4ed92acb3
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/Controllers/Chat/ChatsManager.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Swift/Controllers/Chat/ChatsManager.cpp b/Swift/Controllers/Chat/ChatsManager.cpp index f39f503..e11d14b 100644 --- a/Swift/Controllers/Chat/ChatsManager.cpp +++ b/Swift/Controllers/Chat/ChatsManager.cpp | |||
| @@ -687,21 +687,23 @@ void ChatsManager::setOnline(bool enabled) { | |||
| 687 | if (enabled) { | 687 | if (enabled) { |
| 688 | controllerPair.second->rejoin(); | 688 | controllerPair.second->rejoin(); |
| 689 | } | 689 | } |
| 690 | } | 690 | } |
| 691 | if (!enabled) { | 691 | if (!enabled) { |
| 692 | chatListWindow_->setBookmarksEnabled(false); | ||
| 693 | markAllRecentsOffline(); | 692 | markAllRecentsOffline(); |
| 694 | } else { | 693 | } else { |
| 695 | setupBookmarks(); | 694 | setupBookmarks(); |
| 696 | localMUCServiceFinderWalker_ = boost::make_shared<DiscoServiceWalker>(jid_.getDomain(), iqRouter_); | 695 | localMUCServiceFinderWalker_ = boost::make_shared<DiscoServiceWalker>(jid_.getDomain(), iqRouter_); |
| 697 | localMUCServiceFinderWalker_->onServiceFound.connect(boost::bind(&ChatsManager::handleLocalServiceFound, this, _1, _2)); | 696 | localMUCServiceFinderWalker_->onServiceFound.connect(boost::bind(&ChatsManager::handleLocalServiceFound, this, _1, _2)); |
| 698 | localMUCServiceFinderWalker_->onWalkAborted.connect(boost::bind(&ChatsManager::handleLocalServiceWalkFinished, this)); | 697 | localMUCServiceFinderWalker_->onWalkAborted.connect(boost::bind(&ChatsManager::handleLocalServiceWalkFinished, this)); |
| 699 | localMUCServiceFinderWalker_->onWalkComplete.connect(boost::bind(&ChatsManager::handleLocalServiceWalkFinished, this)); | 698 | localMUCServiceFinderWalker_->onWalkComplete.connect(boost::bind(&ChatsManager::handleLocalServiceWalkFinished, this)); |
| 700 | localMUCServiceFinderWalker_->beginWalk(); | 699 | localMUCServiceFinderWalker_->beginWalk(); |
| 701 | } | 700 | } |
| 702 | 701 | ||
| 702 | if (chatListWindow_) { | ||
| 703 | chatListWindow_->setBookmarksEnabled(enabled); | ||
| 704 | } | ||
| 703 | } | 705 | } |
| 704 | 706 | ||
| 705 | void ChatsManager::handleChatRequest(const std::string &contact) { | 707 | void ChatsManager::handleChatRequest(const std::string &contact) { |
| 706 | ChatController* controller = getChatControllerOrFindAnother(JID(contact)); | 708 | ChatController* controller = getChatControllerOrFindAnother(JID(contact)); |
| 707 | controller->activateChatWindow(); | 709 | controller->activateChatWindow(); |