Commit 760ad715 authored by Ingo Klöcker's avatar Ingo Klöcker
Browse files

Present the value of the keyserver option as-is to the user

Trying to parse the keyserver option breaks entries for LDAP keyserver.

GnuPG-bug-id: 5404
parent 49790088
Pipeline #63167 passed with stage
in 14 minutes and 15 seconds
......@@ -14,7 +14,7 @@ option(DISABLE_KWATCHGNUPG "Don't build the kwatchgnupg tool [default=OFF]" OFF)
# Standalone build. Find / include everything necessary.
set(KF5_MIN_VERSION "5.82.0")
set(KMIME_VERSION "5.17.40")
set(LIBKLEO_VERSION "5.17.45")
set(LIBKLEO_VERSION "5.17.46")
set(QT_REQUIRED_VERSION "5.15.0")
set(GPGME_REQUIRED_VERSION "1.13.1")
set(BOOST_REQUIRED_VERSION "1.58")
......
......@@ -13,7 +13,6 @@
#include <Libkleo/Compat>
#include <Libkleo/DirectoryServicesWidget>
#include <Libkleo/CryptoConfigModule>
#include <QGpgME/Protocol>
......@@ -179,16 +178,6 @@ DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage(QWidget *
load();
}
static QList<QUrl> string2urls(const QString &str)
{
QList<QUrl> ret;
if (str.isEmpty()) {
return ret;
}
ret << QUrl::fromEncoded(str.toLocal8Bit());
return ret;
}
void DirectoryServicesConfigurationPage::load()
{
mWidget->clear();
......@@ -222,7 +211,7 @@ void DirectoryServicesConfigurationPage::load()
qCWarning(KLEOPATRA_LOG) << "Unknown or wrong typed config entry"
<< s_pgpservice_componentName << "/" << s_pgpservice_entryName;
}
mWidget->addOpenPGPServices(string2urls(parseKeyserver(stringValue).url));
mWidget->setOpenPGPService(stringValue);
mWidget->setOpenPGPReadOnly(mOpenPGPServiceEntry && mOpenPGPServiceEntry->isReadOnly());
}
......@@ -312,14 +301,7 @@ void DirectoryServicesConfigurationPage::save()
}
if (mOpenPGPServiceEntry) {
const QList<QUrl> serv = mWidget->openPGPServices();
if (serv.empty()) {
mOpenPGPServiceEntry->setStringValue(QString());
} else {
ParsedKeyserver pks = parseKeyserver(mOpenPGPServiceEntry->stringValue());
pks.url = serv.front().url();
mOpenPGPServiceEntry->setStringValue(assembleKeyserver(pks));
}
mOpenPGPServiceEntry->setStringValue(mWidget->openPGPService());
}
const QTime time{mTimeout->time()};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment