Commit 272c02f8 authored by Volker Krause's avatar Volker Krause
Browse files

Remove usage of KDBusConnectionPool

Summary:
As per T12722 this is no longer needed, QDBusConnection now behaves
correctly in a multi-threaded scenario.

Reviewers: mlaurent

Reviewed By: mlaurent

Subscribers: kde-pim

Tags: #kde_pim

Differential Revision: https://phabricator.kde.org/D27568
parent cd9a35ae
...@@ -44,7 +44,6 @@ find_package(KF5Completion ${KF5_MIN_VERSION} CONFIG REQUIRED) ...@@ -44,7 +44,6 @@ find_package(KF5Completion ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5Config ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Config ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5ConfigWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5ConfigWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5CoreAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5CoreAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5ItemModels ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5ItemModels ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5JobWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5JobWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED)
......
...@@ -115,7 +115,6 @@ target_link_libraries(KF5PimCommonAkonadi ...@@ -115,7 +115,6 @@ target_link_libraries(KF5PimCommonAkonadi
KF5::LibkdepimAkonadi KF5::LibkdepimAkonadi
KF5::Codecs KF5::Codecs
KF5::PimTextEdit KF5::PimTextEdit
KF5::DBusAddons
KF5::XmlGui KF5::XmlGui
KF5::PimTextEdit KF5::PimTextEdit
KF5::KIOWidgets KF5::KIOWidgets
......
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
#include <AkonadiCore/ServerManager> #include <AkonadiCore/ServerManager>
#include <KDBusConnectionPool>
#include <KLocalizedString> #include <KLocalizedString>
#include <KMessageBox> #include <KMessageBox>
#include <QDBusConnection>
#include <QDBusInterface> #include <QDBusInterface>
#include <QDBusPendingCall> #include <QDBusPendingCall>
#include <QDBusPendingReply> #include <QDBusPendingReply>
...@@ -69,7 +69,7 @@ void ManageServerSideSubscriptionJob::start() ...@@ -69,7 +69,7 @@ void ManageServerSideSubscriptionJob::start()
d->mCurrentCollection.resource()); d->mCurrentCollection.resource());
QDBusInterface iface(service, QDBusInterface iface(service,
QStringLiteral("/"), QStringLiteral("org.kde.Akonadi.ImapResourceBase"), QStringLiteral("/"), QStringLiteral("org.kde.Akonadi.ImapResourceBase"),
KDBusConnectionPool::threadConnection(), this); QDBusConnection::sessionBus(), this);
if (!iface.isValid()) { if (!iface.isValid()) {
qCDebug(PIMCOMMONAKONADI_LOG) << "Cannot create imap dbus interface for service " << service; qCDebug(PIMCOMMONAKONADI_LOG) << "Cannot create imap dbus interface for service " << service;
deleteLater(); deleteLater();
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <AkonadiCore/AgentManager> #include <AkonadiCore/AgentManager>
#include <AkonadiCore/ServerManager> #include <AkonadiCore/ServerManager>
#include <KDBusConnectionPool> #include <QDBusConnection>
#include <QDBusInterface> #include <QDBusInterface>
#include <QDBusPendingCall> #include <QDBusPendingCall>
#include <QDBusPendingReply> #include <QDBusPendingReply>
...@@ -57,7 +57,7 @@ void ImapResourceCapabilitiesManager::searchCapabilities(const QString &identifi ...@@ -57,7 +57,7 @@ void ImapResourceCapabilitiesManager::searchCapabilities(const QString &identifi
= Akonadi::ServerManager::agentServiceName(Akonadi::ServerManager::Resource, identifier); = Akonadi::ServerManager::agentServiceName(Akonadi::ServerManager::Resource, identifier);
QDBusInterface iface(service, QDBusInterface iface(service,
QStringLiteral("/"), QStringLiteral("org.kde.Akonadi.ImapResourceBase"), QStringLiteral("/"), QStringLiteral("org.kde.Akonadi.ImapResourceBase"),
KDBusConnectionPool::threadConnection(), this); QDBusConnection::sessionBus(), this);
if (iface.isValid()) { if (iface.isValid()) {
QDBusPendingCall call = iface.asyncCall(QStringLiteral("serverCapabilities")); QDBusPendingCall call = iface.asyncCall(QStringLiteral("serverCapabilities"));
......
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