[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=13dfdb6

The following commit has been merged in the master branch:
commit 13dfdb6b33ef5b03981c0dffd77e5a6a2630143a
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Wed Jan 16 01:37:04 2013 +0100

    Port to KTp::Actions
---
 contact/src/contact-wrapper.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/contact/src/contact-wrapper.cpp b/contact/src/contact-wrapper.cpp
index 8754ddd..5ef5919 100644
--- a/contact/src/contact-wrapper.cpp
+++ b/contact/src/contact-wrapper.cpp
@@ -22,6 +22,7 @@
 #include <KToolInvocation>
 #include <KUrl>
 #include <KDebug>
+#include <KTp/actions.h>
 
 #include <TelepathyQt/AvatarData>
 #include <TelepathyQt/ContactCapabilities>
@@ -29,8 +30,6 @@
 #include <TelepathyQt/PendingChannelRequest>
 #include <TelepathyQt/Presence>
 
-#define PREFERRED_TEXTCHAT_HANDLER "org.freedesktop.Telepathy.Client.KTp.TextUi"
-
 ContactWrapper::ContactWrapper(QObject* parent)
     : QObject(parent)
     , m_account(0)
@@ -204,9 +203,7 @@ void ContactWrapper::startTextChat()
         return;
     }
 
-    Tp::PendingChannelRequest* channelRequest = m_account->ensureTextChat(m_contact,
-                                                                        QDateTime::currentDateTime(),
-                                                                        PREFERRED_TEXTCHAT_HANDLER);
+    Tp::PendingChannelRequest* channelRequest = KTp::Actions::startChat(m_account, m_contact);
     connect(channelRequest, SIGNAL(finished(Tp::PendingOperation*)), this, SLOT(genericOperationFinished(Tp::PendingOperation*)));
 }
 

-- 
ktp-contact-applet packaging