[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=33657ca

The following commit has been merged in the master branch:
commit 33657ca270e3b18b76edb371cf825196806187ac
Author: Rohan Garg <rohangarg at kubuntu.org>
Date:   Wed Mar 21 16:19:41 2012 +0530

    A small fix for displaying the correct state in group chat
---
 lib/chat-widget.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 4b6b09b..e852972 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -701,7 +701,7 @@ void ChatWidget::onChatStatusChanged(const Tp::ContactPtr & contact, Tp::Channel
         d->ui.chatArea->addStatusMessage(statusMessage);
     }
 
-    if (state != Tp::ChannelChatStateComposing) {
+    if (d->isGroupChat) {
         //In a multiperson chat just because this user is no longer typing it doesn't mean that no-one is.
         //loop through each contact, check no-one is in composing mode.
 
@@ -715,9 +715,9 @@ void ChatWidget::onChatStatusChanged(const Tp::ContactPtr & contact, Tp::Channel
             tempState = d->channel->chatState(contact);
 
             if (tempState == Tp::ChannelChatStateComposing) {
-                d->remoteContactChatState = tempState;
-            } else if (tempState == Tp::ChannelChatStatePaused) {
-                d->remoteContactChatState = tempState;
+                state = tempState;
+            } else if (tempState == Tp::ChannelChatStatePaused && state != Tp::ChannelChatStateComposing) {
+                state = tempState;
             }
         }
     }

-- 
ktp-text-ui packaging