From 56498f72ef1fbba08ef48c0cd91867786977c4d1 Mon Sep 17 00:00:00 2001 From: Kevin Smith Date: Mon, 4 Oct 2010 17:41:06 +0100 Subject: Only bounce the dock (or flash the taskbar) on readable messages. Resolves: #453 diff --git a/Swift/Controllers/Chat/ChatController.cpp b/Swift/Controllers/Chat/ChatController.cpp index 18076d8..924ca97 100644 --- a/Swift/Controllers/Chat/ChatController.cpp +++ b/Swift/Controllers/Chat/ChatController.cpp @@ -88,7 +88,9 @@ bool ChatController::isIncomingMessageFromMe(boost::shared_ptr) { void ChatController::preHandleIncomingMessage(boost::shared_ptr messageEvent) { eventController_->handleIncomingEvent(messageEvent); - chatWindow_->flash(); + if (messageEvent->isReadable()) { + chatWindow_->flash(); + } boost::shared_ptr message = messageEvent->getStanza(); JID from = message->getFrom(); if (!from.equals(toJID_, JID::WithResource)) { diff --git a/Swift/Controllers/Chat/MUCController.cpp b/Swift/Controllers/Chat/MUCController.cpp index 064c87e..c4b4086 100644 --- a/Swift/Controllers/Chat/MUCController.cpp +++ b/Swift/Controllers/Chat/MUCController.cpp @@ -229,7 +229,9 @@ void MUCController::preHandleIncomingMessage(boost::shared_ptr mes boost::shared_ptr message = messageEvent->getStanza(); if (joined_ && messageTargetsMe(message) && !message->getPayload()) { eventController_->handleIncomingEvent(messageEvent); - chatWindow_->flash(); + if (messageEvent->isReadable()) { + chatWindow_->flash(); + } } if (joined_) { String nick = message->getFrom().getResource(); -- cgit v0.10.2-6-g49f6