Skip to content
GitLab
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
0dd4d45b
Unverified
Commit
0dd4d45b
authored
Feb 08, 2022
by
Andre Heinecke
Browse files
Unify conversion of gpgconf dirinfo output
In the uiserver socket code we already convert this fromUtf8, which is correct.
parent
0e0197da
Pipeline
#134772
passed with stage
in 2 minutes and 37 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/conf/cryptooperationsconfigwidget.cpp
View file @
0dd4d45b
...
...
@@ -121,7 +121,7 @@ void CryptoOperationsConfigWidget::applyProfile(const QString &profile)
mApplyBtn
->
setEnabled
(
false
);
QDir
datadir
(
QString
::
from
Local8Bit
(
GpgME
::
dirInfo
(
"datadir"
))
+
QStringLiteral
(
"/../doc/gnupg/examples"
));
QDir
datadir
(
QString
::
from
Utf8
(
GpgME
::
dirInfo
(
"datadir"
))
+
QStringLiteral
(
"/../doc/gnupg/examples"
));
const
auto
path
=
datadir
.
filePath
(
profile
+
QStringLiteral
(
".prf"
));
auto
gpgconf
=
new
QProcess
;
...
...
@@ -139,7 +139,7 @@ void CryptoOperationsConfigWidget::applyProfile(const QString &profile)
this
,
[
this
,
gpgconf
,
profile
]
()
{
mApplyBtn
->
setEnabled
(
true
);
if
(
gpgconf
->
exitStatus
()
!=
QProcess
::
NormalExit
)
{
KMessageBox
::
error
(
this
,
QStringLiteral
(
"<pre>%1</pre>"
).
arg
(
QString
::
from
Local8Bit
(
gpgconf
->
readAll
())));
KMessageBox
::
error
(
this
,
QStringLiteral
(
"<pre>%1</pre>"
).
arg
(
QString
::
from
Utf8
(
gpgconf
->
readAll
())));
delete
gpgconf
;
return
;
}
...
...
@@ -167,7 +167,7 @@ void CryptoOperationsConfigWidget::setupProfileGui(QBoxLayout *layout)
qCDebug
(
KLEOPATRA_LOG
)
<<
"Engine version false"
;
return
;
}
QDir
datadir
(
QString
::
from
Local8Bit
(
GpgME
::
dirInfo
(
"datadir"
))
+
QStringLiteral
(
"/../doc/gnupg/examples"
));
QDir
datadir
(
QString
::
from
Utf8
(
GpgME
::
dirInfo
(
"datadir"
))
+
QStringLiteral
(
"/../doc/gnupg/examples"
));
if
(
!
datadir
.
exists
())
{
qCDebug
(
KLEOPATRA_LOG
)
<<
"Failed to find gnupg's example profile directory"
<<
datadir
.
path
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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