[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=4e79d3c

The following commit has been merged in the master branch:
commit 4e79d3c28661ecce917964cc52a8e787deee2ffa
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Oct 2 14:40:39 2010 +0000

    Fixed "title()" method in ChatWindow.
    Update the chat application to set windowTitle based on the title of the
    active tab.
    
    svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1181854
---
 app/mainwindow.cpp | 3 ++-
 lib/chatwindow.cpp | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
index 8bca32d..f4ae472 100644
--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -99,5 +99,6 @@ void MainWindow::updateTabIcon(KIcon newIcon)
 
 void MainWindow::onCurrentIndexChanged(int index)
 {
-    setWindowTitle(tabText(index));
+    ChatWindow* chat = qobject_cast<ChatWindow*>(widget(index));
+    setWindowTitle(chat->title());
 }
diff --git a/lib/chatwindow.cpp b/lib/chatwindow.cpp
index ecdf04f..e4e1ab4 100644
--- a/lib/chatwindow.cpp
+++ b/lib/chatwindow.cpp
@@ -45,6 +45,7 @@ public:
     MessageBoxEventFilter* messageBoxEventFilter;
     QAction* showFormatToolbarAction;
     bool isGroupChat;
+    QString title;
 };
 
 
@@ -135,7 +136,7 @@ void ChatWindow::changeEvent(QEvent *e)
 
 QString ChatWindow::title()
 {
-    return "not implemented yet.";
+    return d->title;
 }
 
 
@@ -329,7 +330,8 @@ void ChatWindow::updateEnabledState(bool enable)
         ui->chatArea->initialise(info);
 
         //inform anyone using the class of the new name for this chat.
-        Q_EMIT titleChanged(info.chatName());
+        d->title = info.chatName();
+        Q_EMIT titleChanged(d->title);
         //FIXME emit the correct icon here too
     }
 }

-- 
ktp-text-ui packaging