[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ktp-common-internals/mklapetek/SpaceBar] KTp/Declarative: [declarative] Return 0 unread messages if
From:       Martin Klapetek <mklapetek () kde ! org>
Date:       2016-03-16 0:16:18
Message-ID: E1afz8M-0005bD-Jz () scm ! kde ! org
[Download RAW message or body]

Git commit 93e534174a2a56a6f975eef7bad7da09a0a5c329 by Martin Klapetek.
Committed on 16/03/2016 at 00:14.
Pushed by mklapetek into branch 'mklapetek/SpaceBar'.

[declarative] Return 0 unread messages if channel is null

M  +5    -1    KTp/Declarative/messages-model.cpp

http://commits.kde.org/telepathy-common-internals/93e534174a2a56a6f975eef7b=
ad7da09a0a5c329

diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-=
model.cpp
index 24c2824..df07e04 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
@@ -418,7 +418,11 @@ void MessagesModel::removeChannelSignals(const Tp::Tex=
tChannelPtr &channel)
 =

 int MessagesModel::unreadCount() const
 {
-    return d->textChannel->messageQueue().size();
+    if (d->textChannel) {
+        return d->textChannel->messageQueue().size();
+    }
+
+    return 0;
 }
 =

 void MessagesModel::acknowledgeAllMessages()

[prev in list] [next in list] [prev in thread] [next in thread]