[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=93696e2

The following commit has been merged in the master branch:
commit 93696e28278f4f6c3e31eebf802158c2696be467
Author: Andrea Scarpino <andrea at archlinux.org>
Date:   Wed Mar 13 22:21:25 2013 +0059

    Port to KTp::Actions
---
 main-widget.cpp | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 0cf4f79..b4e784d 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -38,6 +38,7 @@
 #include <TelepathyQt/PendingReady>
 #include <TelepathyQt/TextChannel>
 
+#include <KTp/actions.h>
 #include <KTp/contact-factory.h>
 #include <KTp/types.h>
 #include <KTp/Widgets/add-contact-dialog.h>
@@ -64,8 +65,6 @@
 #include "tooltips/tooltipmanager.h"
 #include "context-menu.h"
 
-#define PREFERRED_TEXTCHAT_HANDLER "org.freedesktop.Telepathy.Client.KDE.TextUi"
-
 bool kde_tp_filter_contacts_by_publication_status(const Tp::ContactPtr &contact)
 {
     return contact->publishState() == Tp::Contact::PresenceStateAsk;
@@ -238,13 +237,7 @@ void MainWidget::onJoinChatRoomRequested()
         // check account validity. Should NEVER be invalid
         if (!account.isNull()) {
             // ensure chat room
-            Tp::ChannelRequestHints hints;
-            hints.setHint("org.kde.telepathy","forceRaiseWindow", QVariant(true));
-
-            Tp::PendingChannelRequest *channelRequest = account->ensureTextChatroom(dialog.data()->selectedChatRoom(),
-                                                                                    QDateTime::currentDateTime(),
-                                                                                    PREFERRED_TEXTCHAT_HANDLER,
-                                                                                    hints);
+            Tp::PendingChannelRequest *channelRequest = KTp::Actions::startGroupChat(account, dialog.data()->selectedChatRoom());
 
             connect(channelRequest, SIGNAL(finished(Tp::PendingOperation*)), SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
         }

-- 
ktp-contact-list packaging