[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=41a94ae

The following commit has been merged in the master branch:
commit 41a94aec676f19cf0c55ced5d2486eacaca1d544
Author: Marcin Ziemiński <zieminn at gmail.com>
Date:   Thu Jul 31 20:55:55 2014 +0200

    Fixed bug with remote fingerprint length.
    
    Signed-off-by: Marcin Ziemiński <zieminn at gmail.com>
---
 otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp | 3 +++
 otr-proxy/KTpProxy/otr-utils.h                   | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp b/otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp
index 11ef05f..3cb685e 100644
--- a/otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp
+++ b/otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp
@@ -304,6 +304,8 @@ void OtrProxyChannel::Adaptee::stop(const Tp::Service::ChannelProxyInterfaceOTRA
 void OtrProxyChannel::Adaptee::trustFingerprint(const QString& fingerprint, bool trust,
         const Tp::Service::ChannelProxyInterfaceOTRAdaptor::TrustFingerprintContextPtr &context)
 {
+    kDebug() << "TrustFingeprint - " << trust << ": " << fingerprint << " when remote is: " << otrSes.remoteFingerprint();
+
     if(otrSes.remoteFingerprint().isEmpty() || fingerprint != otrSes.remoteFingerprint()) {
         context->setFinishedWithError(TP_QT_ERROR_INVALID_ARGUMENT,
                 QLatin1String("No such fingerprint currently in use by remote contact"));
@@ -313,6 +315,7 @@ void OtrProxyChannel::Adaptee::trustFingerprint(const QString& fingerprint, bool
     OTR::TrustFpResult fpRes = otrSes.trustFingerprint(trust);
     if(fpRes != OTR::TrustFpResult::OK) {
         // should not happend, TODO clarify
+        kDebug() << "Trust error";
         context->setFinishedWithError(TP_QT_ERROR_INVALID_ARGUMENT,
                 QLatin1String("No such fingerprint currently in use by remote contact"));
         return;
diff --git a/otr-proxy/KTpProxy/otr-utils.h b/otr-proxy/KTpProxy/otr-utils.h
index 81c6b2f..4b26191 100644
--- a/otr-proxy/KTpProxy/otr-utils.h
+++ b/otr-proxy/KTpProxy/otr-utils.h
@@ -24,6 +24,8 @@
 #include <QStringList>
 #include <QDBusObjectPath>
 
+#include <KDebug>
+
 extern "C" {
 #include <libotr/privkey.h>
 }
@@ -44,8 +46,7 @@ namespace utils
     {
         char human[OTRL_PRIVKEY_FPRINT_HUMAN_LEN];
         otrl_privkey_hash_to_human(human, fingerprint);
-
-        return QString::fromLocal8Bit(human, OTRL_PRIVKEY_FPRINT_HUMAN_LEN);
+        return QString::fromLocal8Bit(human, OTRL_PRIVKEY_FPRINT_HUMAN_LEN-1);
     }
 
     inline QString accountIdFor(const QDBusObjectPath &objectPath)

-- 
ktp-common-internals packaging