[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=46e4a5b

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

    [declarative] Create MessagesModel on setting new text channel
    
    Reviewed-by: Alexandr Akulich <akulichalexander at gmail.com>
---
 KTp/Declarative/conversation.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/KTp/Declarative/conversation.cpp b/KTp/Declarative/conversation.cpp
index 6199cac..d162dd2 100644
--- a/KTp/Declarative/conversation.cpp
+++ b/KTp/Declarative/conversation.cpp
@@ -80,6 +80,9 @@ Conversation::Conversation(QObject *parent) : QObject(parent)
 
 void Conversation::setTextChannel(const Tp::TextChannelPtr& channel)
 {
+    if (!d->messages) {
+        d->messages = new MessagesModel(d->account, this);
+    }
     if (d->messages->textChannel() != channel) {
         d->messages->setTextChannel(channel);
         d->valid = channel->isValid();

-- 
ktp-common-internals packaging