[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=b8466c2

The following commit has been merged in the master branch:
commit b8466c22190ec8de441954beb800dfc925848065
Author: Marcin Ziemiński <zieminn at gmail.com>
Date:   Wed Aug 6 14:03:24 2014 +0200

    Fixed issue with initialization of trustLevel property on startup.
---
 lib/channel-adapter.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/channel-adapter.cpp b/lib/channel-adapter.cpp
index ec8f412..6863c55 100644
--- a/lib/channel-adapter.cpp
+++ b/lib/channel-adapter.cpp
@@ -40,7 +40,7 @@ namespace
 class OTRMessage : public Tp::ReceivedMessage
 {
     public:
-        OTRMessage(const Tp::ReceivedMessage &recMes) 
+        OTRMessage(const Tp::ReceivedMessage &recMes)
             : Tp::ReceivedMessage(recMes)
         {
         }
@@ -70,7 +70,8 @@ struct ChannelAdapter::Private
 {
     Private(ChatWidget *chat)
         : chat(chat),
-        otrConnected(false)
+        otrConnected(false),
+        trustLevel(Tp::OTRTrustLevelNotPrivate)
     {
     }
 
@@ -214,6 +215,10 @@ void ChannelAdapter::onTrustLevelPropertyGet(Tp::PendingOperation *op)
         kWarning() << "Could not get property: TrustLevel";
         return;
     }
+    // we must have received trust level changed signal before
+    if(d->trustLevel != Tp::OTRTrustLevelNotPrivate) {
+        return;
+    }
     Tp::PendingVariant *pv = dynamic_cast<Tp::PendingVariant*>(op);
     d->trustLevel = static_cast<Tp::OTRTrustLevel>(pv->result().toUInt(NULL));
     Q_EMIT otrTrustLevelChanged(d->trustLevel, Tp::OTRTrustLevelNotPrivate);

-- 
ktp-text-ui packaging