[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=a279b75

The following commit has been merged in the master branch:
commit a279b7516971480f8b05286707c02172aee1d9f2
Author: Marcin Ziemiński <zieminn at gmail.com>
Date:   Sat Aug 16 22:11:55 2014 +0200

    Add notifications about OTR events
---
 lib/chat-widget.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index bd6e67f..bcd10e7 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -916,17 +916,14 @@ void ChatWidget::handleIncomingMessage(const Tp::ReceivedMessage &message, bool
 
             d->ui.chatArea->addStatusMessage(text, message.sender()->alias(), message.received());
         } else {
-
+            KTp::Message processedMessage(KTp::MessageProcessor::instance()->processIncomingMessage(message, d->account, d->channel.textChannel()));
+            if (!alreadyNotified) {
+                d->notifyFilter->filterMessage(processedMessage,
+                        KTp::MessageContext(d->account, d->channel.textChannel()));
+            }
             if(Tp::Utils::isOtrEvent(message)) {
-                // TODO use notify filter to present to user when unencrypted message was received
                 d->ui.chatArea->addStatusMessage(Tp::Utils::processOtrMessage(message));
             } else {
-                KTp::Message processedMessage(KTp::MessageProcessor::instance()->processIncomingMessage(message, d->account, d->channel.textChannel()));
-
-                if (!alreadyNotified) {
-                    d->notifyFilter->filterMessage(processedMessage,
-                                                   KTp::MessageContext(d->account, d->channel.textChannel()));
-                }
                 d->ui.chatArea->addMessage(processedMessage);
             }
         }

-- 
ktp-text-ui packaging