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

The following commit has been merged in the master branch:
commit f984de688965cd19acb61c6f94db0bb3f7fa6c6b
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Mon Jul 23 11:31:28 2012 +0300

    Do not restart the chat state timer if the user just cleared the text box.
---
 lib/chat-widget.cpp | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index e30d7b5..31cae62 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -864,17 +864,16 @@ void ChatWidget::onInputBoxChanged()
     //if the box is empty
     bool textBoxEmpty = d->ui.sendMessageBox->toPlainText().isEmpty();
 
-    //if the timer is active, it means the user is continuously typing
-    if (d->pausedStateTimer->isActive()) {
-        //just restart the timer and don't spam with chat state changes
-        d->pausedStateTimer->start(5000);
-        return;
-    }
-
     if(!textBoxEmpty) {
-        //if the user has typed some text, set state to Composing and start the timer
-        d->channel->requestChatState(Tp::ChannelChatStateComposing);
-        d->pausedStateTimer->start(5000);
+        //if the timer is active, it means the user is continuously typing
+        if (d->pausedStateTimer->isActive()) {
+            //just restart the timer and don't spam with chat state changes
+            d->pausedStateTimer->start(5000);
+        } else {
+            //if the user has just typed some text, set state to Composing and start the timer
+            d->channel->requestChatState(Tp::ChannelChatStateComposing);
+            d->pausedStateTimer->start(5000);
+        }
     } else {
         //if the user typed no text/cleared the input field, set Active and stop the timer
         d->channel->requestChatState(Tp::ChannelChatStateActive);

-- 
ktp-text-ui packaging