[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=8c04eda

The following commit has been merged in the master branch:
commit 8c04eda2c73d3093766283e20f483c15c881968b
Author: Stefan Eggers <coloncolonone at gmail.com>
Date:   Sun Mar 17 13:16:50 2013 +0000

    Suppress notifications while writing out messages from backlog
    
    BUG: 316175
    REVIEW: 109535
---
 lib/chat-widget.cpp | 10 ++++++----
 lib/chat-widget.h   |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 1f91b85..612fb87 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -470,7 +470,7 @@ void ChatWidget::onHistoryFetched(const QList<AdiumThemeContentInfo> &messages)
 
     //process any messages we've 'missed' whilst initialising.
     Q_FOREACH(const Tp::ReceivedMessage &message, d->channel->messageQueue()) {
-        handleIncomingMessage(message);
+        handleIncomingMessage(message, true);
     }
 }
 
@@ -500,7 +500,7 @@ bool ChatWidget::isOnTop() const
     return ( isActiveWindow() && isVisible() );
 }
 
-void ChatWidget::handleIncomingMessage(const Tp::ReceivedMessage &message)
+void ChatWidget::handleIncomingMessage(const Tp::ReceivedMessage &message, bool alreadyNotified)
 {
     kDebug() << title() << message.text();
 
@@ -623,8 +623,10 @@ void ChatWidget::handleIncomingMessage(const Tp::ReceivedMessage &message)
 
             // FIXME: eventually find a way to make MessageProcessor allow per
             //        instance filters.
-            d->notifyFilter->filterMessage(processedMessage,
-                                           KTp::MessageContext(d->account, d->channel));
+            if (!alreadyNotified) {
+                d->notifyFilter->filterMessage(processedMessage,
+                                               KTp::MessageContext(d->account, d->channel));
+            }
 
             messageInfo.setMessage(processedMessage.finalizedMessage());
             messageInfo.setScript(processedMessage.finalizedScript());
diff --git a/lib/chat-widget.h b/lib/chat-widget.h
index fcda548..95b86f8 100644
--- a/lib/chat-widget.h
+++ b/lib/chat-widget.h
@@ -122,7 +122,7 @@ protected:
 
 protected Q_SLOTS:
     /** Show the received message in the chat window*/
-    void handleIncomingMessage(const Tp::ReceivedMessage &message);
+    void handleIncomingMessage(const Tp::ReceivedMessage &message, bool alreadyNotified = false);
 
     /** Show the message sent in the chat window*/
     void handleMessageSent(const Tp::Message &message,

-- 
ktp-text-ui packaging