aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Heinecke <[email protected]>2019-03-20 08:56:38 +0000
committerAndre Heinecke <[email protected]>2019-03-20 08:56:38 +0000
commit47369569e23482bdd24a136b071192352b1d1347 (patch)
tree6e69eae6047b16ad5d08f654c8cd992420ef43b6
parentcore: Support GPGME_AUDITLOG_DIAG for gpgsm. (diff)
downloadgpgme-47369569e23482bdd24a136b071192352b1d1347.tar.gz
gpgme-47369569e23482bdd24a136b071192352b1d1347.zip
qt: Handle diagnostic audit log for CMS
* lang/qt/src/threadedjobmixin.cpp(_detail::audit_log_as_html): Handle CMS audit log.
-rw-r--r--lang/qt/src/threadedjobmixin.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/lang/qt/src/threadedjobmixin.cpp b/lang/qt/src/threadedjobmixin.cpp
index d5399f7b..3302918b 100644
--- a/lang/qt/src/threadedjobmixin.cpp
+++ b/lang/qt/src/threadedjobmixin.cpp
@@ -132,7 +132,13 @@ QString _detail::audit_log_as_html(Context *ctx, GpgME::Error &err)
}
if (ctx->protocol() == CMS) {
- if ((err = ctx->lastError()) || (err = ctx->getAuditLog(data, CMSAuditLogFlags))) {
+ if ((err = ctx->lastError())) {
+ if ((err = ctx->getAuditLog(data, Context::DiagnosticAuditLog))) {
+ return QString::fromLocal8Bit(err.asString());
+ }
+ const QByteArray ba = dp.data();
+ return markupDiagnostics(stringFromGpgOutput(ba));
+ } else if ((err = ctx->getAuditLog(data, CMSAuditLogFlags))) {
return QString::fromLocal8Bit(err.asString());
}
const QByteArray ba = dp.data();