[SCM] ktp-common-internals packaging branch, master, updated. debian/16.04.2-1-111-g6e00b1c

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit a63c02dc22b6271382c8d33fdca8165426642595
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Wed Mar 2 18:14:22 2016 -0500

    [declarative] Add property hasUnreadMessages directly to Conversation
    
    Reviewed-by: Alexandr Akulich <akulichalexander at gmail.com>
---
 KTp/Declarative/conversation.cpp | 11 +++++++++++
 KTp/Declarative/conversation.h   |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/KTp/Declarative/conversation.cpp b/KTp/Declarative/conversation.cpp
index 2742320..a479603 100644
--- a/KTp/Declarative/conversation.cpp
+++ b/KTp/Declarative/conversation.cpp
@@ -64,6 +64,7 @@ Conversation::Conversation(const Tp::TextChannelPtr &channel,
     connect(d->account.data(), SIGNAL(connectionChanged(Tp::ConnectionPtr)), SLOT(onAccountConnectionChanged(Tp::ConnectionPtr)));
 
     d->messages = new MessagesModel(account, this);
+    connect(d->messages, &MessagesModel::unreadCountChanged, this, &Conversation::unreadMessagesChanged);
     setTextChannel(channel);
 
     d->delegated = false;
@@ -82,6 +83,7 @@ void Conversation::setTextChannel(const Tp::TextChannelPtr& channel)
 {
     if (!d->messages) {
         d->messages = new MessagesModel(d->account, this);
+        connect(d->messages, &MessagesModel::unreadCountChanged, this, &Conversation::unreadMessagesChanged);
     }
     if (d->messages->textChannel() != channel) {
         d->messages->setTextChannel(channel);
@@ -257,3 +259,12 @@ Conversation::~Conversation()
     }
     delete d;
 }
+
+bool Conversation::hasUnreadMessages() const
+{
+    if (d->messages) {
+        return d->messages->unreadCount() > 0;
+    }
+
+    return false;
+}
diff --git a/KTp/Declarative/conversation.h b/KTp/Declarative/conversation.h
index 6f07d66..0ab8321 100644
--- a/KTp/Declarative/conversation.h
+++ b/KTp/Declarative/conversation.h
@@ -39,6 +39,7 @@ class Conversation : public QObject
     Q_PROPERTY(QIcon avatar READ avatar NOTIFY avatarChanged)
     Q_PROPERTY(Tp::AccountPtr account READ account CONSTANT)
     Q_PROPERTY(KTp::ContactPtr targetContact READ targetContact CONSTANT)
+    Q_PROPERTY(bool hasUnreadMessages READ hasUnreadMessages NOTIFY unreadMessagesChanged)
 
 public:
     Conversation(const Tp::TextChannelPtr &channel, const Tp::AccountPtr &account, QObject *parent = 0);
@@ -61,12 +62,15 @@ public:
 
     bool isValid();
 
+    bool hasUnreadMessages() const;
+
 Q_SIGNALS:
     void validityChanged(bool isValid);
     void avatarChanged();
     void titleChanged();
     void presenceIconChanged();
     void conversationCloseRequested();
+    void unreadMessagesChanged();
 
 public Q_SLOTS:
     void delegateToProperClient();

-- 
ktp-common-internals packaging