Commit a6bd1f17 authored by Volker Krause's avatar Volker Krause
Browse files

Remove usage of KDBusConnectionPool

As per T12722 this is no longer needed, QDBusConnection now behaves
correctly in a multi-threaded scenario.
parent 4fbd2028
......@@ -65,7 +65,6 @@ find_package(KF5Config ${KF5_MIN_VERSION} REQUIRED)
find_package(KF5ConfigWidgets ${KF5_MIN_VERSION} REQUIRED)
find_package(KF5CoreAddons ${KF5_MIN_VERSION} REQUIRED)
find_package(KF5Crash ${KF5_MIN_VERSION} REQUIRED)
find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5DNSSD ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5DocTools ${KF5_MIN_VERSION} REQUIRED)
find_package(KF5GlobalAccel ${KF5_MIN_VERSION} CONFIG REQUIRED)
......
......@@ -23,7 +23,6 @@ target_link_libraries(akonadi_notes_agent
KF5::Mime
KF5::AkonadiAgentBase
KF5::NotifyConfig
KF5::DBusAddons
notesharedprivate
KF5::PimCommon
KF5::PimTextEdit
......
......@@ -28,7 +28,7 @@
#include <Kdelibs4ConfigMigrator>
#include <KDBusConnectionPool>
#include <QDBusConnection>
#include <KWindowSystem>
NotesAgent::NotesAgent(const QString &id)
......@@ -43,7 +43,7 @@ NotesAgent::NotesAgent(const QString &id)
mNotesManager = new NotesManager(this);
new NotesAgentAdaptor(this);
KDBusConnectionPool::threadConnection().registerObject(QStringLiteral("/NotesAgent"),
QDBusConnection::sessionBus().registerObject(QStringLiteral("/NotesAgent"),
this, QDBusConnection::ExportAdaptors);
QString service = QStringLiteral("org.freedesktop.Akonadi.NotesAgent");
......@@ -51,7 +51,7 @@ NotesAgent::NotesAgent(const QString &id)
service += QLatin1Char('.') + Akonadi::ServerManager::instanceIdentifier();
}
KDBusConnectionPool::threadConnection().registerService(service);
QDBusConnection::sessionBus().registerService(service);
setNeedsNetwork(true);
......
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