[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=06061ed

The following commit has been merged in the master branch:
commit 06061ed0a96a72b40c1fee572c35f4dd47969145
Author: Aleix Pol <aleixpol at kde.org>
Date:   Tue Feb 19 03:31:49 2013 +0100

    Port the ConversationsModel::startChat to KTP::Contacts
    
    Otherwise we can't start chats from a pinned contact
    
    REVIEW: 109037
---
 KTp/Declarative/conversations-model.cpp | 2 +-
 KTp/Declarative/conversations-model.h   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/KTp/Declarative/conversations-model.cpp b/KTp/Declarative/conversations-model.cpp
index a87a7de..8d63f16 100644
--- a/KTp/Declarative/conversations-model.cpp
+++ b/KTp/Declarative/conversations-model.cpp
@@ -145,7 +145,7 @@ bool ConversationsModel::bypassApproval() const
     return true;
 }
 
-void ConversationsModel::startChat(const Tp::AccountPtr &account, const Tp::ContactPtr &contact)
+void ConversationsModel::startChat(const Tp::AccountPtr &account, const KTp::ContactPtr &contact)
 {
     Q_ASSERT(account);
     account->ensureTextChat(contact, QDateTime::currentDateTime(),
diff --git a/KTp/Declarative/conversations-model.h b/KTp/Declarative/conversations-model.h
index 3dd8a1b..1fd7eca 100644
--- a/KTp/Declarative/conversations-model.h
+++ b/KTp/Declarative/conversations-model.h
@@ -23,6 +23,7 @@
 #include <QAbstractListModel>
 
 #include <TelepathyQt/AbstractClientApprover>
+#include <KTp/contact.h>
 
 class Conversation;
 
@@ -51,7 +52,7 @@ class ConversationsModel : public QAbstractListModel, public Tp::AbstractClientH
     bool bypassApproval() const;
 
   public Q_SLOTS:
-    void startChat(const Tp::AccountPtr &account, const Tp::ContactPtr &contact);
+    void startChat(const Tp::AccountPtr& account, const KTp::ContactPtr& contact);
     int nextActiveConversation(int first);
 
   private:

-- 
ktp-common-internals packaging