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
35f24bc6
Commit
35f24bc6
authored
Jan 05, 2021
by
Ingo Klöcker
Browse files
Fix build with gpgme < 1.15.0
parent
66efcb74
Pipeline
#46496
passed with stage
in 19 minutes and 52 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/dialogs/certificatedetailswidget.cpp
View file @
35f24bc6
...
...
@@ -46,8 +46,9 @@
#if GPGMEPP_VERSION >= 0x10E00 // 1.14.0
# define GPGME_HAS_REMARKS
#endif
#if GPGMEPP_VERSION >= 0x10E01 // 1.14.1
#include <QGpgME/Debug>
#if GPGMEPP_VERSION >= 0x10F00 // 1.15.0
# define GPGME_HAS_WITH_SECRET
# include <QGpgME/Debug>
#endif
#define HIDE_ROW(row) \
...
...
@@ -603,15 +604,21 @@ void CertificateDetailsWidget::setKey(const GpgME::Key &key)
auto
ctx
=
QGpgME
::
Job
::
context
(
job
);
ctx
->
addKeyListMode
(
GpgME
::
WithTofu
);
ctx
->
addKeyListMode
(
GpgME
::
SignatureNotations
);
#ifdef GPGME_HAS_WITH_SECRET
if
(
key
.
hasSecret
())
{
ctx
->
addKeyListMode
(
GpgME
::
WithSecret
);
}
#endif
// Windows QGpgME new style connect problem makes this necessary.
connect
(
job
,
SIGNAL
(
result
(
GpgME
::
KeyListResult
,
std
::
vector
<
GpgME
::
Key
>
,
QString
,
GpgME
::
Error
)),
this
,
SLOT
(
keyListDone
(
GpgME
::
KeyListResult
,
std
::
vector
<
GpgME
::
Key
>
,
QString
,
GpgME
::
Error
)));
#ifdef GPGME_HAS_WITH_SECRET
job
->
start
(
QStringList
()
<<
QLatin1String
(
key
.
primaryFingerprint
()));
#else
job
->
start
(
QStringList
()
<<
QLatin1String
(
key
.
primaryFingerprint
()),
key
.
hasSecret
());
#endif
}
GpgME
::
Key
CertificateDetailsWidget
::
key
()
const
...
...
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