[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=995172a

The following commit has been merged in the master branch:
commit 995172a0fcfab999174c4dabbcf9c0a004786af3
Author: Aleix Pol <aleixpol at kde.org>
Date:   Wed Aug 13 10:31:09 2014 +0200

    Make it possible to clear the current conversations
    
    Adds a method to the ConversationsModel that goes through every
    conversation and closes it.
    
    REVIEW: 119750
---
 KTp/Declarative/conversations-model.cpp | 7 +++++++
 KTp/Declarative/conversations-model.h   | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/KTp/Declarative/conversations-model.cpp b/KTp/Declarative/conversations-model.cpp
index f8f08bd..8ba92cd 100644
--- a/KTp/Declarative/conversations-model.cpp
+++ b/KTp/Declarative/conversations-model.cpp
@@ -206,3 +206,10 @@ int ConversationsModel::activeChatIndex() const
 {
     return d->activeChatIndex;
 }
+
+void ConversationsModel::clearConversations()
+{
+    Q_FOREACH(Conversation *c, d->conversations) {
+        c->requestClose();
+    }
+}
diff --git a/KTp/Declarative/conversations-model.h b/KTp/Declarative/conversations-model.h
index 7f128b3..c1ae1a5 100644
--- a/KTp/Declarative/conversations-model.h
+++ b/KTp/Declarative/conversations-model.h
@@ -50,6 +50,8 @@ class ConversationsModel : public QAbstractListModel, public Tp::AbstractClientH
         ConversationRole = Qt::UserRole
     };
 
+    Q_INVOKABLE void clearConversations();
+
     void handleChannels(const Tp::MethodInvocationContextPtr<> &context,
                         const Tp::AccountPtr &account,
                         const Tp::ConnectionPtr &connection,

-- 
ktp-common-internals packaging