Unverified Commit 3af0ec69 authored by Andre Heinecke's avatar Andre Heinecke
Browse files

Remove obsolete GPGME ifdefs

We currently depend on 1.11 and don't need to guard against
1.8 anymore.
parent 043c463d
......@@ -1926,12 +1926,8 @@ void AdvancedSettingsDialog::loadDefaultKeyType()
} else if (protocol == OpenPGP && keyType == QLatin1String("DSA+ELG")) {
setKeyType(Subkey::AlgoDSA);
setSubkeyType(Subkey::AlgoELG_E);
#if GPGMEPP_VERSION > 0x10800
// GPGME 1.8.0 has a bug that makes the gpgconf engine
// return garbage so we don't load it for this
} else if (keyType.isEmpty() && engineIsVersion(2, 1, 17)) {
loadDefaultGnuPGKeyType();
#endif
} else {
if (!keyType.isEmpty() && keyType != QLatin1String("RSA"))
qCWarning(KLEOPATRA_LOG) << "invalid value \"" << qPrintable(keyType)
......
......@@ -13,9 +13,6 @@
#include <gpgme++/engineinfo.h>
#include <gpgme++/key.h>
/* Support compilation with GPGME older than 1.9. */
# define GPGME_HAS_KEY_IS_DEVS
/* Does the given object comply with DE_VS? This macro can be used to
ensure that we can still build against older versions of GPGME
without cluttering the code with preprocessor conditionals. */
......
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