[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=9b40fe5

The following commit has been merged in the master branch:
commit 9b40fe5df91951159ec46897aae3ffc9191b293c
Author: Lasath Fernando <kde at lasath.org>
Date:   Wed Jul 6 14:51:58 2011 +0530

    removed ChatWindow::createNewChat().
---
 app/chat-window.cpp       | 9 ---------
 app/chat-window.h         | 1 -
 app/telepathy-chat-ui.cpp | 4 +++-
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index 5206e3f..28905fa 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -426,15 +426,6 @@ void ChatWindow::showNotificationsDialog()
     KNotifyConfigWidget::configure(this, "ktelepathy");
 }
 
-void ChatWindow::createNewChat(const Tp::TextChannelPtr &channelPtr, const Tp::AccountPtr &accountPtr)
-{
-    kDebug();
-
-    ChatTab *chatTab = new ChatTab(channelPtr, accountPtr, m_tabWidget);
-
-    chatTab->setWindow(this);
-}
-
 void ChatWindow::sendNotificationToUser(ChatWindow::NotificationType type, const QString& errorMsg)
 {
     //The pointer is automatically deleted when the event is closed
diff --git a/app/chat-window.h b/app/chat-window.h
index d5c7859..a46e41b 100644
--- a/app/chat-window.h
+++ b/app/chat-window.h
@@ -56,7 +56,6 @@ public:
     /** creats a new chat and adds it to the tab widget
      * @param channelPtr pointer to textChannel to use
      */
-    void createNewChat(const Tp::TextChannelPtr &channelPtr, const Tp::AccountPtr &account);
     void addTab(ChatTab* tab);
     void removeTab(ChatTab* tab);
 
diff --git a/app/telepathy-chat-ui.cpp b/app/telepathy-chat-ui.cpp
index c60a30c..8369338 100644
--- a/app/telepathy-chat-ui.cpp
+++ b/app/telepathy-chat-ui.cpp
@@ -135,9 +135,11 @@ void TelepathyChatUi::handleChannels(const Tp::MethodInvocationContextPtr<> & co
                 window = createWindow();
                 break;
         }
-        window->createNewChat(textChannel, account);
+        ChatTab* tab = new ChatTab(textChannel, account);
+        tab->setWindow(window);
         window->show();
     }
+
     context->setFinished();
 }
 

-- 
ktp-text-ui packaging