Commit c4865e1f authored by Ingo Klöcker's avatar Ingo Klöcker
Browse files

Don't show success message if revokation was canceled

Also: Start the upload of the changed certificate after showing the
success message.

GnuPG-bug-id: 5094
parent 697dd515
Pipeline #40368 failed with stage
in 10 minutes and 20 seconds
......@@ -120,18 +120,21 @@ void RevokeCertificationCommand::Private::slotDialogRejected()
void RevokeCertificationCommand::Private::slotResult(const Error &err)
{
if (!err && !err.isCanceled() && dialog && dialog->sendToServer()) {
ExportOpenPGPCertsToServerCommand *const cmd = new ExportOpenPGPCertsToServerCommand(certificationTarget);
cmd->start();
} else if (!err) {
information(i18n("Revocation successful."),
i18n("Revocation Succeeded"));
} else {
if (err.isCanceled()) {
// do nothing
} else if (err) {
error(i18n("<p>An error occurred while trying to revoke the certification of<br/><br/>"
"<b>%1</b>:</p><p>\t%2</p>",
Formatting::formatForComboBox(certificationTarget),
QString::fromUtf8(err.asString())),
i18n("Revocation Error"));
} else {
information(i18n("Revocation successful."),
i18n("Revocation Succeeded"));
if (dialog && dialog->sendToServer()) {
ExportOpenPGPCertsToServerCommand *const cmd = new ExportOpenPGPCertsToServerCommand(certificationTarget);
cmd->start();
}
}
finished();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment