diff options
| author | Andre Heinecke <[email protected]> | 2018-04-26 12:11:19 +0000 | 
|---|---|---|
| committer | Andre Heinecke <[email protected]> | 2018-04-26 12:11:19 +0000 | 
| commit | 6b267c56fd6e54fb1c254455c04495534260b547 (patch) | |
| tree | 842d61f22f8ed6f579688ff202909c86c5805126 | |
| parent | core: Do not modify args for ignored failures (diff) | |
| download | gpgme-6b267c56fd6e54fb1c254455c04495534260b547.tar.gz gpgme-6b267c56fd6e54fb1c254455c04495534260b547.zip | |
qt: Fix filename handling in cryptoconfig
* 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
| -rw-r--r-- | lang/qt/src/qgpgmenewcryptoconfig.cpp | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/lang/qt/src/qgpgmenewcryptoconfig.cpp b/lang/qt/src/qgpgmenewcryptoconfig.cpp index ba028a97..070ab697 100644 --- a/lang/qt/src/qgpgmenewcryptoconfig.cpp +++ b/lang/qt/src/qgpgmenewcryptoconfig.cpp @@ -42,6 +42,7 @@  #include "gpgme_backend_debug.h"  #include <QFile> +#include <QDir>  #include "global.h"  #include "error.h" @@ -521,8 +522,7 @@ QUrl QGpgMENewCryptoConfigEntry::urlValue() const      Q_ASSERT(type == FilenameType || type == LdapServerType);      Q_ASSERT(!isList());      if (type == FilenameType) { -        QUrl url; -        url.setPath(QFile::decodeName(m_option.currentValue().stringValue())); +        QUrl url = QUrl::fromLocalFile(m_option.currentValue().stringValue());          return url;      }      return parseURL(type, stringValue()); @@ -635,7 +635,7 @@ void QGpgMENewCryptoConfigEntry::setURLValue(const QUrl &url)      if (str.isEmpty() && !isOptional()) {          m_option.resetToDefaultValue();      } 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 {          m_option.setNewValue(m_option.createStringArgument(str.toUtf8().constData()));      } | 
