[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=1a0b7e2

The following commit has been merged in the master branch:
commit 1a0b7e2843e15beb543fda4d954e50417f4a7228
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Wed Feb 10 22:16:37 2016 -0500

    [declarative] Guard against null stuff
    
    Reviewed-by: Alexandr Akulich <akulichalexander at gmail.com>
---
 KTp/Declarative/conversation.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/KTp/Declarative/conversation.cpp b/KTp/Declarative/conversation.cpp
index d162dd2..2742320 100644
--- a/KTp/Declarative/conversation.cpp
+++ b/KTp/Declarative/conversation.cpp
@@ -122,18 +122,22 @@ QString Conversation::title() const
     if (d->isGroupChat) {
         QString roomName = textChannel()->targetId();
         return roomName.left(roomName.indexOf(QLatin1Char('@')));
-    } else {
+    } else if (!d->targetContact.isNull()) {
         return d->targetContact->alias();
     }
+
+    return QString();
 }
 
 QIcon Conversation::presenceIcon() const
 {
     if (d->isGroupChat) {
         return KTp::Presence(Tp::Presence::available()).icon();
-    } else {
+    } else if (!d->targetContact.isNull()) {
         return KTp::Presence(d->targetContact->presence()).icon();
     }
+
+    return QIcon();
 }
 
 QIcon Conversation::avatar() const

-- 
ktp-common-internals packaging