Commit a0502bdf 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: #kde_pim, mlaurent

Reviewed By: #kde_pim, mlaurent

Subscribers: kde-pim

Tags: #kde_pim

Differential Revision: https://phabricator.kde.org/D27551
parent 383af60d
......@@ -38,7 +38,6 @@ find_package(KF5Completion ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5Config ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5Codecs ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5IconThemes ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5Service ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5TextWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5WidgetsAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
......
......@@ -136,7 +136,6 @@ target_link_libraries(KF5AkonadiContact
KF5::IconThemes
KF5::KIOWidgets
KF5::Mime
KF5::DBusAddons
KF5::I18n
KF5::TextWidgets
KF5::XmlGui
......
......@@ -25,7 +25,6 @@
#include <QProcess>
#include <QDBusConnection>
#include <QDBusConnectionInterface>
#include <KDBusConnectionPool>
#include <QDBusInterface>
#include <QDBusReply>
......@@ -44,7 +43,7 @@ static bool isEkigaServiceRegistered()
return true;
}
interface = KDBusConnectionPool::threadConnection().interface();
interface = QDBusConnection::sessionBus().interface();
if (interface->isServiceRegistered(service)) {
return true;
}
......@@ -59,7 +58,7 @@ static QDBusInterface *searchEkigaDBusInterface()
QDBusInterface *interface = new QDBusInterface(service, path, QString(), QDBusConnection::sessionBus());
if (!interface->isValid()) {
delete interface;
interface = new QDBusInterface(service, path, QString(), KDBusConnectionPool::threadConnection());
interface = new QDBusInterface(service, path, QString(), QDBusConnection::sessionBus());
}
return interface;
......
......@@ -25,7 +25,6 @@
#include <QProcess>
#include <QDBusConnection>
#include <QDBusConnectionInterface>
#include <KDBusConnectionPool>
#if !defined(Q_OS_WIN)
#include <unistd.h>
......@@ -42,7 +41,7 @@ static bool isSflPhoneServiceRegistered()
return true;
}
interface = KDBusConnectionPool::threadConnection().interface();
interface = QDBusConnection::sessionBus().interface();
if (interface->isServiceRegistered(service)) {
return true;
}
......
......@@ -21,8 +21,6 @@
#include "qskypedialer.h"
#include <KDBusConnectionPool>
#include <QProcess>
#include <QDBusConnection>
#include <QDBusConnectionInterface>
......@@ -45,7 +43,7 @@ static bool isSkypeServiceRegistered()
return true;
}
interface = KDBusConnectionPool::threadConnection().interface();
interface = QDBusConnection::sessionBus().interface();
if (interface->isServiceRegistered(service)) {
return true;
}
......@@ -61,7 +59,7 @@ static QDBusInterface *searchSkypeDBusInterface()
QDBusInterface *interface = new QDBusInterface(service, path, QString(), QDBusConnection::sessionBus());
if (!interface->isValid()) {
delete interface;
interface = new QDBusInterface(service, path, QString(), KDBusConnectionPool::threadConnection());
interface = new QDBusInterface(service, path, QString(), QDBusConnection::sessionBus());
}
return interface;
......
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