[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=2f406bd

The following commit has been merged in the master branch:
commit 2f406bd139bf2f02a286d10998b8611f59aca2b6
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Wed Mar 2 18:22:38 2016 -0500

    [declarative] Emit Conversation::validityChanged at the end
    
    ...with the rest of the signals
    
    Reviewed-by: Alexandr Akulich <akulichalexander at gmail.com>
---
 KTp/Declarative/conversation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KTp/Declarative/conversation.cpp b/KTp/Declarative/conversation.cpp
index a479603..60af807 100644
--- a/KTp/Declarative/conversation.cpp
+++ b/KTp/Declarative/conversation.cpp
@@ -90,7 +90,6 @@ void Conversation::setTextChannel(const Tp::TextChannelPtr& channel)
         d->valid = channel->isValid();
         connect(channel.data(), SIGNAL(invalidated(Tp::DBusProxy*,QString,QString)),
                 SLOT(onChannelInvalidated(Tp::DBusProxy*,QString,QString)));
-        Q_EMIT validityChanged(d->valid);
 
         if (channel->targetContact().isNull()) {
             d->isGroupChat = true;
@@ -106,6 +105,7 @@ void Conversation::setTextChannel(const Tp::TextChannelPtr& channel)
         Q_EMIT avatarChanged();
         Q_EMIT titleChanged();
         Q_EMIT presenceIconChanged();
+        Q_EMIT validityChanged(d->valid);
     }
 }
 

-- 
ktp-common-internals packaging