[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=2aa32aa

The following commit has been merged in the master branch:
commit 2aa32aa5db66c3a06d16001ce092c7906e68f844
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Nov 30 14:54:08 2012 -0800

    Correctly emit notifications for messages recieved in an active chat
    
    BUG: 310946
    Fixed-In: 0.5.2
---
 lib/chat-widget.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index bbc8451..bc8f5cd 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -709,12 +709,7 @@ void ChatWidget::notifyAboutIncomingMessage(const Tp::ReceivedMessage & message)
     //choose the correct notification type:
     //options are:
     // kde_telepathy_contact_incoming
-    // kde_telepathy_contact_incoming_active_window - TODO - requires information not available yet.
-    //FIXME: until the above is available, simply deactivate the event
-    if(isOnTop()) {
-        kDebug() << "Widget is on top, not doing anything";
-        return;
-    }
+    // kde_telepathy_contact_incoming_active_window
     // don't notify of messages sent by self from another computer
     if (message.sender() == d->channel->groupSelfContact()) {
         return;
@@ -734,10 +729,13 @@ void ChatWidget::notifyAboutIncomingMessage(const Tp::ReceivedMessage & message)
     } else if(message.messageType() == Tp::ChannelTextMessageTypeNotice) {
         notificationType = QLatin1String("kde_telepathy_info_event");
     } else {
-        notificationType = QLatin1String("kde_telepathy_contact_incoming");
+        if (isOnTop()) {
+            notificationType = QLatin1String("kde_telepathy_contact_incoming_active_window");
+        } else {
+            notificationType = QLatin1String("kde_telepathy_contact_incoming");
+        }
     }
 
-
     KNotification *notification = new KNotification(notificationType, this,
                                                     KNotification::RaiseWidgetOnActivation
                                                     | KNotification::CloseWhenWidgetActivated

-- 
ktp-text-ui packaging