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

The following commit has been merged in the master branch:
commit a0492908262fe1ae1fa3d6e8e2cf7b9a229a3368
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Tue Mar 15 20:14:12 2016 -0400

    [declarative] Return 0 unread messages if channel is null
    
    Reviewed-by: Alexandr Akulich <akulichalexander at gmail.com>
---
 KTp/Declarative/messages-model.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index 6a002d9..0519b23 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
@@ -359,7 +359,11 @@ void MessagesModel::removeChannelSignals(const Tp::TextChannelPtr &channel)
 
 int MessagesModel::unreadCount() const
 {
-    return d->textChannel->messageQueue().size();
+    if (d->textChannel) {
+        return d->textChannel->messageQueue().size();
+    }
+
+    return 0;
 }
 
 void MessagesModel::acknowledgeAllMessages()

-- 
ktp-common-internals packaging