GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt: Fix filename handling in cryptoconfig

Browse Source 
* src/qgpgmenewcryptoconfig.cpp (QGpgMENewCryptoConfigEntry::urlValue):
Build url from local file.
(QGpgMENewCryptoConfigEntry::setURLValue): Set native seperated
path.

--
This fixes setting files through cryptoconfig on Windows.
GnuPG-Bug-Id: T3939
This commit is contained in:
Andre Heinecke 2018-04-26 14:11:19 +02:00
parent 7706fa2c92
commit 6b267c56fd
No known key found for this signature in database
GPG Key ID: 2978E9D40CBABA5C
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lang/qt/src/qgpgmenewcryptoconfig.cpp
View File

@ -42,6 +42,7 @@
#include "gpgme_backend_debug.h" #include "gpgme_backend_debug.h"
#include <QFile> #include <QFile>
#include <QDir>
#include "global.h" #include "global.h"
#include "error.h" #include "error.h"
@ -521,8 +522,7 @@ QUrl QGpgMENewCryptoConfigEntry::urlValue() const
Q_ASSERT(type == FilenameType || type == LdapServerType); Q_ASSERT(type == FilenameType || type == LdapServerType);
Q_ASSERT(!isList()); Q_ASSERT(!isList());
if (type == FilenameType) { if (type == FilenameType) {
QUrl url; QUrl url = QUrl::fromLocalFile(m_option.currentValue().stringValue());
url.setPath(QFile::decodeName(m_option.currentValue().stringValue()));
return url; return url;
} }
return parseURL(type, stringValue()); return parseURL(type, stringValue());
@ -635,7 +635,7 @@ void QGpgMENewCryptoConfigEntry::setURLValue(const QUrl &url)
if (str.isEmpty() && !isOptional()) { if (str.isEmpty() && !isOptional()) {
m_option.resetToDefaultValue(); m_option.resetToDefaultValue();
} else if (type == FilenameType) { } else if (type == FilenameType) {
m_option.setNewValue(m_option.createStringArgument(QFile::encodeName(str).constData())); m_option.setNewValue(m_option.createStringArgument(QDir::toNativeSeparators(url.toLocalFile()).toUtf8().constData()));
} else { } else {
m_option.setNewValue(m_option.createStringArgument(str.toUtf8().constData())); m_option.setNewValue(m_option.createStringArgument(str.toUtf8().constData()));
} }