[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=df49203

The following commit has been merged in the master branch:
commit df4920307a1f05b91bc156fa3fd6458d445dd2a2
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Apr 14 21:50:26 2014 +0200

    Remove now duplicated code to start a text channel
---
 main-widget.cpp | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 6e5fce3..a976e43 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -254,21 +254,10 @@ void MainWidget::onGenericOperationFinished(Tp::PendingOperation* operation)
 
 void MainWidget::onJoinChatRoomRequested()
 {
-    QWeakPointer<KTp::JoinChatRoomDialog> dialog = new KTp::JoinChatRoomDialog(m_accountManager);
-
-    if (dialog.data()->exec() == QDialog::Accepted) {
-        Tp::AccountPtr account = dialog.data()->selectedAccount();
-
-        // check account validity. Should NEVER be invalid
-        if (!account.isNull()) {
-            // ensure chat room
-            Tp::PendingChannelRequest *channelRequest = KTp::Actions::startGroupChat(account, dialog.data()->selectedChatRoom());
-
-            connect(channelRequest, SIGNAL(finished(Tp::PendingOperation*)), SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
-        }
-    }
+    KTp::JoinChatRoomDialog *dialog = new KTp::JoinChatRoomDialog(m_accountManager);
+    dialog->setAttribute(Qt::WA_DeleteOnClose);
 
-    delete dialog.data();
+    dialog->show();
 }
 
 void MainWidget::onMakeCallRequested()

-- 
ktp-contact-list packaging