[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=57149ae

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

    Port to KTp::Actions
---
 presence/src/presence-applet.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/presence/src/presence-applet.cpp b/presence/src/presence-applet.cpp
index 58b6737..e7f94cf 100644
--- a/presence/src/presence-applet.cpp
+++ b/presence/src/presence-applet.cpp
@@ -32,6 +32,7 @@
 #include <KMessageBox>
 #include <KStandardDirs>
 
+#include <KTp/actions.h>
 #include <KTp/global-presence.h>
 #include <KTp/Widgets/add-contact-dialog.h>
 #include <KTp/Widgets/join-chat-room-dialog.h>
@@ -45,8 +46,6 @@
 #include <TelepathyQt/PendingChannelRequest>
 #include <TelepathyQt/Account>
 
-#define PREFERRED_TEXTCHAT_HANDLER "org.freedesktop.Telepathy.Client.KDE.TextUi"
-
 int TelepathyPresenceApplet::s_instanceCount = 0;
 
 TelepathyPresenceApplet::TelepathyPresenceApplet(QObject *parent, const QVariantList &args)
@@ -272,14 +271,7 @@ void TelepathyPresenceApplet::onJoinChatRoomSelected()
     Tp::AccountPtr account = dialog->selectedAccount();
     // 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->selectedChatRoom(),
-                                                                                QDateTime::currentDateTime(),
-                                                                                PREFERRED_TEXTCHAT_HANDLER,
-                                                                                hints);
+        Tp::PendingChannelRequest *channelRequest = KTp::Actions::startGroupChat(account, dialog->selectedChatRoom());
 
         connect(channelRequest, SIGNAL(finished(Tp::PendingOperation*)), SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
     }

-- 
ktp-contact-applet packaging