[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=6a17d39

The following commit has been merged in the master branch:
commit 6a17d395aac68b3afa7056131187d98c0ebb89fd
Author: Aleix Pol <aleixpol at kde.org>
Date:   Tue Mar 3 14:41:44 2015 +0100

    Don't crash if the ConversationsModel has been disabled
    
    If there's no ConversationsModel, then it's not chatting already.
---
 KTp/Declarative/pinned-contacts-model.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KTp/Declarative/pinned-contacts-model.cpp b/KTp/Declarative/pinned-contacts-model.cpp
index e2bef5a..8ef21a1 100644
--- a/KTp/Declarative/pinned-contacts-model.cpp
+++ b/KTp/Declarative/pinned-contacts-model.cpp
@@ -146,7 +146,7 @@ QVariant PinnedContactsModel::data(const QModelIndex &index, int role) const
         case AccountRole:
             return QVariant::fromValue<Tp::AccountPtr>(p->account());
         case AlreadyChattingRole: {
-            if (!p->contact()) {
+            if (!p->contact() || !d->conversations) {
                 return false;
             }
             bool found = false;

-- 
ktp-common-internals packaging