[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=beb3924

The following commit has been merged in the master branch:
commit beb3924fd3c3b1865aff38e6fe686ea777573ba6
Author: Marcin Ziemiński <zieminn at gmail.com>
Date:   Tue Aug 19 21:37:00 2014 +0200

    Return default OtrlMessageEvent in the Message
    
    Signed-off-by: Marcin Ziemiński <zieminn at gmail.com>
---
 otr-proxy/KTpProxy/otr-message.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/otr-proxy/KTpProxy/otr-message.cpp b/otr-proxy/KTpProxy/otr-message.cpp
index e1ddf5b..017a724 100644
--- a/otr-proxy/KTpProxy/otr-message.cpp
+++ b/otr-proxy/KTpProxy/otr-message.cpp
@@ -109,7 +109,11 @@ namespace OTR
 
     OtrlMessageEvent Message::getOTRevent() const
     {
-        return static_cast<OtrlMessageEvent>(message[0][QLatin1String("otr-message-event")].variant().toUInt(nullptr));
+        if(isOTRevent()) {
+            return static_cast<OtrlMessageEvent>(message[0][QLatin1String("otr-message-event")].variant().toUInt(nullptr));
+        } else {
+            return OTRL_MSGEVENT_NONE;
+        }
     }
 
     void Message::setOTRheader(const QString &header, const QString &text)

-- 
ktp-common-internals packaging