[git] GPGME - branch, master, updated. gpgme-1.6.0-152-g54314a9

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  54314a9c7d7ad52981c836ca742644a1fa69b518 (commit)
       via  9d6f85bd25e51445f1776b498875e77b529311b1 (commit)
      from  c88c9ef384b6f7bda9a61b58f26c2f89ae25f684 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 54314a9c7d7ad52981c836ca742644a1fa69b518
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Jun 1 13:46:27 2016 +0200

    Cpp: Use whitelist for status messages
    
    * lang/cpp/src/editinteractor.cpp (EditInteractor::needsNoResponse):
    Use whitelist instead of blacklist.
    
    --
    This should be more robust when new status messages are added.
    The whitelist is the same GPA uses. Fixes Qt's t-ownertrust.

diff --git a/lang/cpp/src/editinteractor.cpp b/lang/cpp/src/editinteractor.cpp
index fb68bcb..d2633b5 100644
--- a/lang/cpp/src/editinteractor.cpp
+++ b/lang/cpp/src/editinteractor.cpp
@@ -201,20 +201,16 @@ Error EditInteractor::lastError() const
 bool EditInteractor::needsNoResponse(unsigned int status) const
 {
     switch (status) {
-    case GPGME_STATUS_EOF:
-    case GPGME_STATUS_GOT_IT:
-    case GPGME_STATUS_NEED_PASSPHRASE:
+    case GPGME_STATUS_ALREADY_SIGNED:
+    case GPGME_STATUS_ERROR:
+    case GPGME_STATUS_GET_BOOL:
+    case GPGME_STATUS_GET_LINE:
+    case GPGME_STATUS_KEY_CREATED:
     case GPGME_STATUS_NEED_PASSPHRASE_SYM:
-    case GPGME_STATUS_GOOD_PASSPHRASE:
-    case GPGME_STATUS_BAD_PASSPHRASE:
-    case GPGME_STATUS_USERID_HINT:
-    case GPGME_STATUS_SIGEXPIRED:
-    case GPGME_STATUS_KEYEXPIRED:
-    case GPGME_STATUS_PINENTRY_LAUNCHED:
-    case GPGME_STATUS_KEY_CONSIDERED:
-        return true;
-    default:
+    case GPGME_STATUS_SC_OP_FAILURE:
         return false;
+    default:
+        return true;
     }
 }
 

commit 9d6f85bd25e51445f1776b498875e77b529311b1
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Jun 1 10:01:43 2016 +0200

    Qt: Fix debug output in t-ownertrust
    
    * lang/qt/tests/t-ownertrust.cpp (testChangeOwnerTrust): Remove
    general debug of trust level. Add debug output for error.

diff --git a/lang/qt/tests/t-ownertrust.cpp b/lang/qt/tests/t-ownertrust.cpp
index d4385bf..eb6c3db 100644
--- a/lang/qt/tests/t-ownertrust.cpp
+++ b/lang/qt/tests/t-ownertrust.cpp
@@ -58,12 +58,14 @@ private Q_SLOTS:
         Q_ASSERT (!result.error());
         Q_ASSERT (keys.size() == 1);
         Key key = keys.front();
-        qDebug() << "Trust is: " << key.ownerTrust();
         Q_ASSERT (key.ownerTrust() == Key::Unknown);
 
         ChangeOwnerTrustJob *job2 = openpgp()->changeOwnerTrustJob();
         connect(job2, &ChangeOwnerTrustJob::result, this, [this](Error e)
         {
+            if (e) {
+                qDebug() <<  "Error in result: " << e.asString();
+            }
             Q_ASSERT(!e);
             Q_EMIT asyncDone();
         });

-----------------------------------------------------------------------

Summary of changes:
 lang/cpp/src/editinteractor.cpp | 20 ++++++++------------
 lang/qt/tests/t-ownertrust.cpp  |  4 +++-
 2 files changed, 11 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org