Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-10-20 07:58:12 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-10-20 08:04:21 (GMT) |
| commit | d46ebaac1cf7161fd0a551c34cf80f441f6d19ab (patch) | |
| tree | a47705e770329b386b48b6fb5883965740cf438d /Swift/Controllers/Chat/ChatController.cpp | |
| parent | a49ca97a7b2ad61385d0f6f22ec598a63d889ae7 (diff) | |
| download | swift-d46ebaac1cf7161fd0a551c34cf80f441f6d19ab.zip swift-d46ebaac1cf7161fd0a551c34cf80f441f6d19ab.tar.bz2 | |
Tell MUCController to handle disconnect/reconnect rejoins.
This causes the MUCController to deal with reconnects by requesting
a rejoin. It also prepares for doing time-based context requests.
Although I've traced the code down, and confirmed that
presenceSender->sendPresence(joinPresence);
is being called, the stanza is never sent. This needs further
investigation, as currently it prevents the rejoins working.
Resolves: #625
Diffstat (limited to 'Swift/Controllers/Chat/ChatController.cpp')
| -rw-r--r-- | Swift/Controllers/Chat/ChatController.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Swift/Controllers/Chat/ChatController.cpp b/Swift/Controllers/Chat/ChatController.cpp index 9046dc3..0247c0e 100644 --- a/Swift/Controllers/Chat/ChatController.cpp +++ b/Swift/Controllers/Chat/ChatController.cpp @@ -127,8 +127,8 @@ void ChatController::handleStanzaAcked(boost::shared_ptr<Stanza> stanza) { unackedStanzas_.erase(unackedStanzas_.find(stanza)); } -void ChatController::setEnabled(bool enabled) { - if (!enabled) { +void ChatController::setOnline(bool online) { + if (!online) { std::map<boost::shared_ptr<Stanza>, String>::iterator it = unackedStanzas_.begin(); for ( ; it != unackedStanzas_.end(); it++) { chatWindow_->setAckState(it->second, ChatWindow::Failed); @@ -140,7 +140,7 @@ void ChatController::setEnabled(bool enabled) { fakeOffline->setType(Presence::Unavailable); chatStateTracker_->handlePresenceChange(fakeOffline); } - ChatControllerBase::setEnabled(enabled); + ChatControllerBase::setOnline(online); } String ChatController::senderDisplayNameFromMessage(const JID& from) { |