[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=670a3a5

The following commit has been merged in the master branch:
commit 670a3a5c7c049b14655087ebb241a3066447b611
Author: Marcin Ziemiński <zieminn at gmail.com>
Date:   Sat Aug 16 21:13:01 2014 +0200

    Add few comments
    
    Signed-off-by: Marcin Ziemiński <zieminn at gmail.com>
---
 otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp | 2 ++
 otr-proxy/KTpProxy/otr-proxy-channel-adaptee.h   | 2 +-
 otr-proxy/KTpProxy/otr-session.cpp               | 6 +++---
 otr-proxy/KTpProxy/otr-session.h                 | 3 +++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp b/otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp
index c189a44..9fd2681 100644
--- a/otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp
+++ b/otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp
@@ -395,10 +395,12 @@ void OtrProxyChannel::Adaptee::onMessageReceived(const Tp::ReceivedMessage &rece
 {
     const uint id = receivedMessage.header()[QLatin1String("pending-message-id")].variant().toUInt(nullptr);
     OTR::Message otrMsg(receivedMessage.parts());
+    // no private key - should generate on now
     if(otrMsg.isOTRmessage() && otrSes.localFingerprint().isEmpty() && ps->getPolicy() != OTRL_POLICY_NEVER) {
         enqueuedMessages << receivedMessage;
         acquirePrivateKey();
         return;
+    // private key is currently being generated
     } else if(isGenerating) {
         enqueuedMessages << receivedMessage;
         return;
diff --git a/otr-proxy/KTpProxy/otr-proxy-channel-adaptee.h b/otr-proxy/KTpProxy/otr-proxy-channel-adaptee.h
index 91ab5b1..78fd81b 100644
--- a/otr-proxy/KTpProxy/otr-proxy-channel-adaptee.h
+++ b/otr-proxy/KTpProxy/otr-proxy-channel-adaptee.h
@@ -119,7 +119,7 @@ class OtrProxyChannel::Adaptee : public QObject
 
         QMap<uint, Tp::ReceivedMessage> messages; // queue
         QList<Tp::ReceivedMessage> enqueuedMessages; // when there is now private key generated
-        bool isGenerating; // is a new private key for this account being generated
+        bool isGenerating; // is the new private key for this account being generated
         bool aboutToInit; // user wanted to start the OTR session but no private key was available
 };
 
diff --git a/otr-proxy/KTpProxy/otr-session.cpp b/otr-proxy/KTpProxy/otr-session.cpp
index 11113f8..298196d 100644
--- a/otr-proxy/KTpProxy/otr-session.cpp
+++ b/otr-proxy/KTpProxy/otr-session.cpp
@@ -175,7 +175,7 @@ namespace OTR
                 ctx.recipientName.toLocal8Bit(),
                 instance);
 
-        onTrustLevelChanged(nullptr);
+        onTrustLevelChanged();
     }
 
     CryptResult Session::encrypt(Message &message)
@@ -274,7 +274,7 @@ namespace OTR
         }
 
         if(isFinished) {
-            onTrustLevelChanged(nullptr);
+            onTrustLevelChanged();
         }
 
         return result;
@@ -326,7 +326,7 @@ namespace OTR
 
             TrustFpResult res = pr->trustFingerprint(ctx, fp, trust);
             if(res == TrustFpResult::OK && trustLevel() != TrustLevel::FINISHED) {
-                    onTrustLevelChanged(nullptr);
+                onTrustLevelChanged();
             }
             return res;
         } else {
diff --git a/otr-proxy/KTpProxy/otr-session.h b/otr-proxy/KTpProxy/otr-session.h
index 0515b30..de1b381 100644
--- a/otr-proxy/KTpProxy/otr-session.h
+++ b/otr-proxy/KTpProxy/otr-session.h
@@ -89,6 +89,9 @@ namespace OTR
 
             // functions called by libotr ---------------------------------------
             virtual void handleMessage(const Message &message) = 0;
+
+            /** Report whether you think the given user is online.  Return 1 if
+              you think he is, 0 if you think he isn't, -1 if you're not sure. */
             virtual int recipientStatus() const = 0;
             virtual unsigned int maxMessageSize() const = 0;
 

-- 
ktp-common-internals packaging