Swiftdiff 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/ChatController.cpp | |
| parent | 3f06fdbf826d8d1c1e243cff5fcbf27870f4f0f8 (diff) | |
| download | swift-3b1d44842367b730688ee3a2069a25912cd2721e.zip swift-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/ChatController.cpp')
| -rw-r--r-- | Swift/Controllers/Chat/ChatController.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Swift/Controllers/Chat/ChatController.cpp b/Swift/Controllers/Chat/ChatController.cpp index 722d68c..22ef68d 100644 --- a/Swift/Controllers/Chat/ChatController.cpp +++ b/Swift/Controllers/Chat/ChatController.cpp @@ -91,7 +91,6 @@ bool ChatController::isIncomingMessageFromMe(boost::shared_ptr<Message>) { } void ChatController::preHandleIncomingMessage(boost::shared_ptr<MessageEvent> messageEvent) { - eventController_->handleIncomingEvent(messageEvent); if (messageEvent->isReadable()) { chatWindow_->flash(); lastWasPresence_ = false; @@ -107,6 +106,11 @@ void ChatController::preHandleIncomingMessage(boost::shared_ptr<MessageEvent> me chatStateTracker_->handleMessageReceived(message); } +void ChatController::postHandleIncomingMessage(boost::shared_ptr<MessageEvent> messageEvent) { + eventController_->handleIncomingEvent(messageEvent); +} + + void ChatController::preSendMessageRequest(boost::shared_ptr<Message> message) { chatStateNotifier_->addChatStateRequest(message); } |