Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
Kleopatra
Commits
3af0ec69
Unverified
Commit
3af0ec69
authored
Aug 03, 2020
by
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/newcertificatewizard/newcertificatewizard.cpp
View file @
3af0ec69
...
...
@@ -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
)
...
...
src/utils/gnupg-helper.h
View file @
3af0ec69
...
...
@@ -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. */
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment