diff options
author | Kevin Smith <git@kismith.co.uk> | 2011-03-04 17:05:48 (GMT) |
---|---|---|
committer | Kevin Smith <git@kismith.co.uk> | 2011-03-04 17:05:48 (GMT) |
commit | 3b1d44842367b730688ee3a2069a25912cd2721e (patch) | |
tree | fd8e0750d48a4e89fff0684a852716631c9e59d4 /Swift/Controllers/Chat/MUCController.cpp | |
parent | 3f06fdbf826d8d1c1e243cff5fcbf27870f4f0f8 (diff) | |
download | swift-contrib-3b1d44842367b730688ee3a2069a25912cd2721e.zip swift-contrib-3b1d44842367b730688ee3a2069a25912cd2721e.tar.bz2 |
Don't show popups if the chat's on top.
Resolves: #774
Release-Notes: Popup notifications for new messages should no longer be generated if the relevant chat is currently selected.
Diffstat (limited to 'Swift/Controllers/Chat/MUCController.cpp')
-rw-r--r-- | Swift/Controllers/Chat/MUCController.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Swift/Controllers/Chat/MUCController.cpp b/Swift/Controllers/Chat/MUCController.cpp index aaa9d3a..7729c8c 100644 --- a/Swift/Controllers/Chat/MUCController.cpp +++ b/Swift/Controllers/Chat/MUCController.cpp @@ -265,7 +265,6 @@ void MUCController::preHandleIncomingMessage(boost::shared_ptr<MessageEvent> mes clearPresenceQueue(); boost::shared_ptr<Message> message = messageEvent->getStanza(); if (joined_ && messageEvent->getStanza()->getFrom().getResource() != nick_ && messageTargetsMe(message) && !message->getPayload<Delay>()) { - eventController_->handleIncomingEvent(messageEvent); if (messageEvent->isReadable()) { chatWindow_->flash(); } @@ -294,6 +293,13 @@ void MUCController::preHandleIncomingMessage(boost::shared_ptr<MessageEvent> mes } } +void MUCController::postHandleIncomingMessage(boost::shared_ptr<MessageEvent> messageEvent) { + boost::shared_ptr<Message> message = messageEvent->getStanza(); + if (joined_ && messageEvent->getStanza()->getFrom().getResource() != nick_ && messageTargetsMe(message) && !message->getPayload<Delay>()) { + eventController_->handleIncomingEvent(messageEvent); + } +} + void MUCController::handleOccupantRoleChanged(const std::string& nick, const MUCOccupant& occupant, const MUCOccupant::Role& oldRole) { clearPresenceQueue(); receivedActivity(); |