[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=2b70053

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

    Add startGroupChat() to KTp::Actions
    
    Reviewed-by: David Edmundson
---
 KTp/actions.cpp | 18 ++++++++++++++++++
 KTp/actions.h   |  3 +++
 2 files changed, 21 insertions(+)

diff --git a/KTp/actions.cpp b/KTp/actions.cpp
index 76547b0..0ace50f 100644
--- a/KTp/actions.cpp
+++ b/KTp/actions.cpp
@@ -59,6 +59,24 @@ Tp::PendingChannelRequest* Actions::startChat(const Tp::AccountPtr &account,
                                    hints);
 }
 
+Tp::PendingChannelRequest* Actions::startGroupChat(const Tp::AccountPtr &account,
+                                                   const QString &roomName)
+{
+    if (account.isNull() || roomName.isEmpty()) {
+        kWarning() << "Parameters invalid";
+    }
+
+    kDebug() << "Requesting text chat room " << roomName;
+
+    Tp::ChannelRequestHints hints;
+    hints.setHint(QLatin1String("org.kde.telepathy"), QLatin1String("forceRaiseWindow"), QVariant(true));
+
+    return account->ensureTextChatroom(roomName,
+                                       QDateTime::currentDateTime(),
+                                       PREFERRED_TEXT_CHAT_HANDLER,
+                                       hints);
+}
+
 Tp::PendingChannelRequest* Actions::startAudioCall(const Tp::AccountPtr &account,
                                                    const Tp::ContactPtr &contact)
 {
diff --git a/KTp/actions.h b/KTp/actions.h
index 7efc99f..8546f51 100644
--- a/KTp/actions.h
+++ b/KTp/actions.h
@@ -36,6 +36,9 @@ namespace Actions {
                                                     const Tp::ContactPtr &contact,
                                                     bool delegateToPreferredHandler = true);
 
+    KTP_EXPORT Tp::PendingChannelRequest* startGroupChat(const Tp::AccountPtr &account,
+                                                         const QString &roomName);
+
     KTP_EXPORT Tp::PendingChannelRequest* startAudioCall(const Tp::AccountPtr &account,
                                                          const Tp::ContactPtr &contact);
 

-- 
ktp-common-internals packaging