aboutsummaryrefslogtreecommitdiffstats
path: root/lang/cpp/src/editinteractor.cpp
diff options
context:
space:
mode:
authorAndre Heinecke <[email protected]>2016-06-01 11:46:27 +0000
committerAndre Heinecke <[email protected]>2016-06-01 11:48:28 +0000
commit54314a9c7d7ad52981c836ca742644a1fa69b518 (patch)
treeb292b1f2e2cb6e7df87267d30ed5c594ad300a01 /lang/cpp/src/editinteractor.cpp
parentQt: Fix debug output in t-ownertrust (diff)
downloadgpgme-54314a9c7d7ad52981c836ca742644a1fa69b518.tar.gz
gpgme-54314a9c7d7ad52981c836ca742644a1fa69b518.zip
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.
Diffstat (limited to 'lang/cpp/src/editinteractor.cpp')
-rw-r--r--lang/cpp/src/editinteractor.cpp20
1 files changed, 8 insertions, 12 deletions
diff --git a/lang/cpp/src/editinteractor.cpp b/lang/cpp/src/editinteractor.cpp
index fb68bcb3..d2633b5f 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;
}
}