[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=953a4d5

The following commit has been merged in the master branch:
commit 953a4d52de3d38fe13d43e41113966e2808ae13a
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Jul 16 21:47:30 2013 +0000

    Only try to replace TextChannel in setTextChannel if it has actually changed
    
    Reviewed-by: Aleix Pol
    BUG: 321115
    Fixed-in: 0.7.0
---
 KTp/Declarative/conversation.cpp   | 12 +++++++-----
 KTp/Declarative/messages-model.cpp |  1 +
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/KTp/Declarative/conversation.cpp b/KTp/Declarative/conversation.cpp
index e0b1893..8284d81 100644
--- a/KTp/Declarative/conversation.cpp
+++ b/KTp/Declarative/conversation.cpp
@@ -69,11 +69,13 @@ Conversation::Conversation(QObject *parent) : QObject(parent)
 
 void Conversation::setTextChannel(const Tp::TextChannelPtr& channel)
 {
-    d->messages->setTextChannel(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 (d->messages->textChannel() != channel) {
+        d->messages->setTextChannel(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);
+    }
 }
 
 Tp::TextChannelPtr Conversation::textChannel() const
diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index 38e4591..2598de2 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
@@ -89,6 +89,7 @@ void MessagesModel::setupChannelSignals(const Tp::TextChannelPtr &channel)
 
 void MessagesModel::setTextChannel(Tp::TextChannelPtr channel)
 {
+    Q_ASSERT(channel != d->textChannel);
     kDebug();
     setupChannelSignals(channel);
 

-- 
ktp-common-internals packaging