[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=ac89d3f

The following commit has been merged in the master branch:
commit ac89d3f9a4fa2a8932a34a6120c5bde1400d0aca
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Feb 7 01:24:04 2013 +0100

    Take KTp::ContactPtr instead of Tp::ContactPtr as a param
---
 KTp/Declarative/contact-list.cpp | 2 +-
 KTp/Declarative/contact-list.h   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/KTp/Declarative/contact-list.cpp b/KTp/Declarative/contact-list.cpp
index 6536f32..9e05d5c 100644
--- a/KTp/Declarative/contact-list.cpp
+++ b/KTp/Declarative/contact-list.cpp
@@ -89,7 +89,7 @@ KTp::ContactsFilterModel* ContactList::filterModel() const
     return m_filterModel;
 }
 
-void ContactList::startChat(const Tp::AccountPtr &account, const Tp::ContactPtr &contact)
+void ContactList::startChat(const Tp::AccountPtr &account, const KTp::ContactPtr &contact)
 {
     kDebug() << "Requesting chat for contact" << contact->alias();
     kDebug() << "account is" << account->normalizedName();
diff --git a/KTp/Declarative/contact-list.h b/KTp/Declarative/contact-list.h
index 781b47e..a598144 100644
--- a/KTp/Declarative/contact-list.h
+++ b/KTp/Declarative/contact-list.h
@@ -21,6 +21,7 @@
 
 #include <KTp/Models/contacts-list-model.h>
 #include <KTp/Models/contacts-filter-model.h>
+#include <KTp/contact.h>
 
 #include <TelepathyQt/Types>
 
@@ -35,7 +36,7 @@ class ContactList : public QObject
     KTp::ContactsFilterModel* filterModel() const;
 
   public Q_SLOTS:
-    void startChat(const Tp::AccountPtr &account, const Tp::ContactPtr &contact);
+    void startChat(const Tp::AccountPtr &account, const KTp::ContactPtr &contact);
 
   private Q_SLOTS:
     void onAccountManagerReady(Tp::PendingOperation *op);

-- 
ktp-common-internals packaging