[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=0afae2e

The following commit has been merged in the master branch:
commit 0afae2ec3b8c597952721466d69d5cfbce558d89
Author: Marcin Ziemiński <zieminn at gmail.com>
Date:   Sat Aug 16 19:42:55 2014 +0200

    Updated documentation in xml spec files
    
    Signed-off-by: Marcin Ziemiński <zieminn at gmail.com>
---
 otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp |  20 +++
 otr-proxy/KTpProxy/svc-channel-proxy.h           |  21 ++-
 otr-proxy/KTpProxy/svc-proxy-service.h           |  38 ++++--
 otr-proxy/spec/ChannelProxy_Interface_OTR.xml    | 156 +++++++++++++++--------
 otr-proxy/spec/ProxyService.xml                  |  95 ++++++++++----
 5 files changed, 235 insertions(+), 95 deletions(-)

diff --git a/otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp b/otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp
index 5577dd6..c189a44 100644
--- a/otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp
+++ b/otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp
@@ -327,6 +327,11 @@ void OtrProxyChannel::Adaptee::stop(const Tp::Service::ChannelProxyInterfaceOTRA
 void OtrProxyChannel::Adaptee::trustFingerprint(const QString& fingerprint, bool trust,
         const Tp::Service::ChannelProxyInterfaceOTRAdaptor::TrustFingerprintContextPtr &context)
 {
+    if(!connected()) {
+        context->setFinishedWithError(KTP_PROXY_ERROR_NOT_CONNECTED, QString::fromLatin1("Proxy is not connected"));
+        return;
+    }
+
     kDebug() << "TrustFingeprint - " << trust << ": " << fingerprint << " when remote is: " << otrSes.remoteFingerprint();
 
     if(otrSes.remoteFingerprint().isEmpty() || fingerprint != otrSes.remoteFingerprint()) {
@@ -349,6 +354,11 @@ void OtrProxyChannel::Adaptee::trustFingerprint(const QString& fingerprint, bool
 void OtrProxyChannel::Adaptee::startPeerAuthentication(const QString &question, const QString &secret,
         const Tp::Service::ChannelProxyInterfaceOTRAdaptor::StartPeerAuthenticationContextPtr &ctx)
 {
+    if(!connected()) {
+        ctx->setFinishedWithError(KTP_PROXY_ERROR_NOT_CONNECTED, QString::fromLatin1("Proxy is not connected"));
+        return;
+    }
+
     if(question.isEmpty()) {
         otrSes.initSMPSecret(secret);
     } else {
@@ -360,6 +370,11 @@ void OtrProxyChannel::Adaptee::startPeerAuthentication(const QString &question,
 void OtrProxyChannel::Adaptee::respondPeerAuthentication(const QString &secret,
         const Tp::Service::ChannelProxyInterfaceOTRAdaptor::RespondPeerAuthenticationContextPtr &ctx)
 {
+    if(!connected()) {
+        ctx->setFinishedWithError(KTP_PROXY_ERROR_NOT_CONNECTED, QString::fromLatin1("Proxy is not connected"));
+        return;
+    }
+
     otrSes.respondSMPAuthentication(secret);
     ctx->setFinished();
 }
@@ -367,6 +382,11 @@ void OtrProxyChannel::Adaptee::respondPeerAuthentication(const QString &secret,
 void OtrProxyChannel::Adaptee::abortPeerAuthentication(
         const Tp::Service::ChannelProxyInterfaceOTRAdaptor::AbortPeerAuthenticationContextPtr &ctx)
 {
+    if(!connected()) {
+        ctx->setFinishedWithError(KTP_PROXY_ERROR_NOT_CONNECTED, QString::fromLatin1("Proxy is not connected"));
+        return;
+    }
+
     otrSes.abortSMPAuthentiaction();
     ctx->setFinished();
 }
diff --git a/otr-proxy/KTpProxy/svc-channel-proxy.h b/otr-proxy/KTpProxy/svc-channel-proxy.h
index 49dd19d..c7d0927 100644
--- a/otr-proxy/KTpProxy/svc-channel-proxy.h
+++ b/otr-proxy/KTpProxy/svc-channel-proxy.h
@@ -129,7 +129,7 @@ public: // PROPERTIES
      *
      *
      * \htmlonly
-     * <p>Object path of the channel this proxy is created for.</p>
+     * <p>Object path of the channel this proxy is created for</p>
      * \endhtmlonly
      *
      * 
eturn The value of exported property 
-- 
ktp-common-internals packaging