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

The following commit has been merged in the master branch:
commit 7ab1a1f03af239d7cf73046c33e5d896f6b013ef
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Sat Sep 17 17:20:33 2011 +0100

    Fix string puzzling and possible bug with string duplication
    
    Reviewed-by: David Edmundson, Pino Toscano
---
 app/chat-window.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index 9f918b0..23f3cf4 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -583,10 +583,14 @@ void ChatWindow::startVideoCall(const Tp::AccountPtr& account, const Tp::Contact
 
 void ChatWindow::onUserTypingChanged(bool typing)
 {
+    ChatWidget *currChat =  qobject_cast<ChatWidget*>(m_tabWidget->currentWidget());
+    Q_ASSERT(currChat);
+    QString title = currChat->title();
+
     if (typing) {
-        setWindowTitle(i18n("Typing... %1", windowTitle()));
+        setWindowTitle(i18nc("String prepended in window title, arg is contact's name", "Typing... %1", title));
     } else {
-        setWindowTitle(windowTitle().remove(i18n("Typing... ")));
+        setWindowTitle(title);
     }
 }
 

-- 
ktp-text-ui packaging