Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2011-02-11 13:25:26 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2011-02-11 13:25:26 (GMT) |
| commit | ca01b263f9feea11822e41ccf94b01d3e38e5817 (patch) | |
| tree | 8c20bc0b3b6541cf70c80b41f87c9681fbeb167c /Swift/Controllers/Chat/ChatControllerBase.cpp | |
| parent | e81caa93d528bf7e73e66057093814371a538bf2 (diff) | |
| download | swift-ca01b263f9feea11822e41ccf94b01d3e38e5817.zip swift-ca01b263f9feea11822e41ccf94b01d3e38e5817.tar.bz2 | |
Don't mark MUC Context as unread.
Resolves: #724
Release-Notes: Historical messages received when joining a room will no longer be marked as unread.
Diffstat (limited to 'Swift/Controllers/Chat/ChatControllerBase.cpp')
| -rw-r--r-- | Swift/Controllers/Chat/ChatControllerBase.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Swift/Controllers/Chat/ChatControllerBase.cpp b/Swift/Controllers/Chat/ChatControllerBase.cpp index 7430f69..ca0916d 100644 --- a/Swift/Controllers/Chat/ChatControllerBase.cpp +++ b/Swift/Controllers/Chat/ChatControllerBase.cpp @@ -143,13 +143,10 @@ bool ChatControllerBase::isFromContact(const JID& from) { } void ChatControllerBase::handleIncomingMessage(boost::shared_ptr<MessageEvent> messageEvent) { - if (messageEvent->isReadable()) { + preHandleIncomingMessage(messageEvent); + if (messageEvent->isReadable() && !messageEvent->getConcluded()) { unreadMessages_.push_back(messageEvent); } - - - - preHandleIncomingMessage(messageEvent); boost::shared_ptr<Message> message = messageEvent->getStanza(); String body = message->getBody(); if (message->isError()) { |