Commit 6e23b46c authored by Ingo Klöcker's avatar Ingo Klöcker
Browse files

Filter out any non-OpenPGP keys in filtered key lists if CMS is disabled

Imported X.509 certificates will still be shown in the unfiltered list
of imported certificates.

GnuPG-bug-id: 5688
parent da5e65e8
Pipeline #100551 passed with stage
in 14 minutes and 18 seconds
......@@ -30,7 +30,7 @@ option(DISABLE_KWATCHGNUPG "Don't build the kwatchgnupg tool [default=OFF]" OFF)
# Standalone build. Find / include everything necessary.
set(KF5_MIN_VERSION "5.88.0")
set(KMIME_VERSION "5.19.40")
set(LIBKLEO_VERSION "5.19.42")
set(LIBKLEO_VERSION "5.19.44")
set(QT_REQUIRED_VERSION "5.15.2")
set(GPGME_REQUIRED_VERSION "1.13.1")
set(BOOST_REQUIRED_VERSION "1.58")
......
......@@ -30,6 +30,7 @@
#include <Libkleo/FileSystemWatcher>
#include <Libkleo/KeyCache>
#include <Libkleo/KeyFilterManager>
#include <Libkleo/KeyGroupConfig>
#include <Libkleo/Classify>
......@@ -166,6 +167,13 @@ public:
keyCache->setGroupsEnabled(Settings().groupsEnabled());
}
void setUpFilterManager()
{
if (!Settings{}.cmsEnabled()) {
KeyFilterManager::instance()->alwaysFilterByProtocol(GpgME::OpenPGP);
}
}
void setupLogging()
{
log = Log::mutableInstance();
......@@ -216,6 +224,7 @@ void KleopatraApplication::init()
d->init();
add_resources();
d->setupKeyCache();
d->setUpFilterManager();
d->setupLogging();
#ifndef QT_NO_SYSTEMTRAYICON
d->sysTray->show();
......
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