[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=986c22f

The following commit has been merged in the master branch:
commit 986c22f93ac0e0e79a4e50c72643564b57d5ad43
Author: Aleix Pol <aleixpol at kde.org>
Date:   Sun May 5 00:55:46 2013 +0200

    Now the chat starting is dealt by the telepathy manager
    
    We don't need a separate method to start a chat
    
    Reviewed by David Edmundson
---
 KTp/Declarative/conversations-model.cpp | 7 -------
 KTp/Declarative/conversations-model.h   | 1 -
 2 files changed, 8 deletions(-)

diff --git a/KTp/Declarative/conversations-model.cpp b/KTp/Declarative/conversations-model.cpp
index 5824d75..9cb7e47 100644
--- a/KTp/Declarative/conversations-model.cpp
+++ b/KTp/Declarative/conversations-model.cpp
@@ -149,13 +149,6 @@ bool ConversationsModel::bypassApproval() const
     return true;
 }
 
-void ConversationsModel::startChat(const Tp::AccountPtr &account, const KTp::ContactPtr &contact)
-{
-    Q_ASSERT(account);
-    account->ensureTextChat(contact, QDateTime::currentDateTime(),
-                            QLatin1String("org.freedesktop.Telepathy.Client.KDE.TextUi.ConversationWatcher"));
-}
-
 void ConversationsModel::handleValidityChange(bool valid)
 {
     if (!valid) {
diff --git a/KTp/Declarative/conversations-model.h b/KTp/Declarative/conversations-model.h
index 2f6d6d5..cb4d2e0 100644
--- a/KTp/Declarative/conversations-model.h
+++ b/KTp/Declarative/conversations-model.h
@@ -56,7 +56,6 @@ class ConversationsModel : public QAbstractListModel, public Tp::AbstractClientH
     bool bypassApproval() const;
 
   public Q_SLOTS:
-    void startChat(const Tp::AccountPtr &account, const KTp::ContactPtr &contact);
     int nextActiveConversation(int first);
 
   private:

-- 
ktp-common-internals packaging