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

The following commit has been merged in the master branch:
commit 380684776f32e943aa13899481b64d30a660248f
Author: Marcin Ziemiński <zieminn at gmail.com>
Date:   Mon Aug 25 22:25:13 2014 +0200

    Fixed encoding errors occuring in encryption and decryption process
---
 otr-proxy/KTpProxy/otr-session.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/otr-proxy/KTpProxy/otr-session.cpp b/otr-proxy/KTpProxy/otr-session.cpp
index 10e71a3..60c169f 100644
--- a/otr-proxy/KTpProxy/otr-session.cpp
+++ b/otr-proxy/KTpProxy/otr-session.cpp
@@ -208,9 +208,9 @@ namespace OTR
             } else if(encMessage != nullptr) {
 
                 if(message.contentType().isEmpty()) {
-                    message.setText(QLatin1String(encMessage));
+                    message.setText(QString::fromLocal8Bit(encMessage));
                 } else {
-                    message.setText(QLatin1String(encMessage), message.contentType());
+                    message.setText(QString::fromLocal8Bit(encMessage), message.contentType());
                 }
                 message.setType(Tp::ChannelTextMessageTypeNormal);
                 if(context->active_fingerprint != nullptr) {
@@ -255,9 +255,9 @@ namespace OTR
         if(!ignore) {
             if(decMsg != nullptr) {
                 if(message.contentType().isEmpty()) {
-                    message.setText(QLatin1String(decMsg));
+                    message.setText(QString::fromLocal8Bit(decMsg));
                 } else {
-                    message.setText(QLatin1String(decMsg), message.contentType());
+                    message.setText(QString::fromLocal8Bit(decMsg), message.contentType());
                 }
                 if(context->active_fingerprint != nullptr) {
                     const QString hrFingerprint = OTR::utils::humanReadable(context->active_fingerprint->fingerprint);

-- 
ktp-common-internals packaging