aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Heinecke <[email protected]>2017-03-01 10:14:07 +0000
committerAndre Heinecke <[email protected]>2017-03-01 10:14:07 +0000
commitfbafb5474d8898ba1b267f4b4dfbefe39f04e72f (patch)
tree43176b397569dfa073e2d1b210c822e5e611a224
parentdoc: Correct documentation for recp arg of gpgme_op_encrypt_sign_start (diff)
downloadgpgme-fbafb5474d8898ba1b267f4b4dfbefe39f04e72f.tar.gz
gpgme-fbafb5474d8898ba1b267f4b4dfbefe39f04e72f.zip
qt: Allow creation of default keys without name
* lang/qt/src/defaultkeygenerationjob.cpp (DefaultKeyGenerationJob::start): Handle empty name and email.
-rw-r--r--lang/qt/src/defaultkeygenerationjob.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/lang/qt/src/defaultkeygenerationjob.cpp b/lang/qt/src/defaultkeygenerationjob.cpp
index 020f4d2a..f589384e 100644
--- a/lang/qt/src/defaultkeygenerationjob.cpp
+++ b/lang/qt/src/defaultkeygenerationjob.cpp
@@ -91,6 +91,11 @@ void DefaultKeyGenerationJob::slotCancel()
GpgME::Error DefaultKeyGenerationJob::start(const QString &email, const QString &name)
{
+ const QString namePart = name.isEmpty() ? QString() :
+ QStringLiteral("name-real: %1\n").arg(name);
+ const QString mailPart = email.isEmpty() ? QString() :
+ QStringLiteral("name-email: %1\n").arg(email);
+
const QString args = QStringLiteral("<GnupgKeyParms format=\"internal\">\n"
"%ask-passphrase\n"
"key-type: RSA\n"
@@ -99,9 +104,9 @@ GpgME::Error DefaultKeyGenerationJob::start(const QString &email, const QString
"subkey-type: RSA\n"
"subkey-length: 2048\n"
"subkey-usage: encrypt\n"
- "name-email: %1\n"
- "name-real: %2\n"
- "</GnupgKeyParms>").arg(email, name);
+ "%1"
+ "%2"
+ "</GnupgKeyParms>").arg(mailPart, namePart);
d->job = openpgp()->keyGenerationJob();
d->job->installEventFilter(this);