diff --git a/src/gamecenter/dbus/org.kde.GameCenter1.conf.in b/src/gamecenter/dbus/org.kde.GameCenter1.conf.in
deleted file mode 100644
index 13157bc..0000000
--- a/src/gamecenter/dbus/org.kde.GameCenter1.conf.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/gamecenter/dbus/org.kde.GameCenter1.system.service.in b/src/gamecenter/dbus/org.kde.GameCenter1.system.service.in
deleted file mode 100644
index 3de095c..0000000
--- a/src/gamecenter/dbus/org.kde.GameCenter1.system.service.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=org.kde.GameCenter1
-Exec=@CMAKE_INSTALL_PREFIX@/@KDE_INSTALL_BINDIR@/alakarte-gamecenter --system
-SystemdService=org.kde.GameCenter1.service
diff --git a/src/gamecenter/systemd/org.kde.GameCenter1.system.service.in b/src/gamecenter/systemd/org.kde.GameCenter1.system.service.in
deleted file mode 100644
index 971a621..0000000
--- a/src/gamecenter/systemd/org.kde.GameCenter1.system.service.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=A-La-Karte Game Center
-
-[Service]
-ExecStart=@CMAKE_INSTALL_PREFIX@/@KDE_INSTALL_BINDIR@/alakarte-gamecenter --system
-Type=dbus
-BusName=org.kde.GameCenter1
-Restart=no
diff --git a/src/gamelauncher.cpp b/src/gamelauncher.cpp
index 217daae..f6fa0c2 100644
--- a/src/gamelauncher.cpp
+++ b/src/gamelauncher.cpp
@@ -270,7 +270,6 @@ static QStringList steamCandidateRoots()
GameLauncher::GameLauncher(QObject *parent)
: QObject(parent)
, m_daemonAvailable(false)
- , m_usingSystemBus(false)
{
if (auto *app = qobject_cast(parent)) {
connect(app->gameModel(), &GameModel::countChanged, this, [this]() {
@@ -557,10 +556,7 @@ void GameLauncher::launchGame(Game *game)
// Always try daemon first — for all launch types
{
- QDBusInterface iface(kGameCenterService,
- kGameCenterPath,
- kGameCenterInterface,
- m_usingSystemBus ? QDBusConnection::systemBus() : QDBusConnection::sessionBus());
+ QDBusInterface iface(kGameCenterService, kGameCenterPath, kGameCenterInterface, QDBusConnection::sessionBus());
QVariantMap launchSpec = {
{QStringLiteral("command"), launchCommand},
{QStringLiteral("gameId"), game->id()},
@@ -631,10 +627,7 @@ void GameLauncher::stopGame(Game *game)
return;
}
- QDBusInterface iface(kGameCenterService,
- kGameCenterPath,
- kGameCenterInterface,
- m_usingSystemBus ? QDBusConnection::systemBus() : QDBusConnection::sessionBus());
+ QDBusInterface iface(kGameCenterService, kGameCenterPath, kGameCenterInterface, QDBusConnection::sessionBus());
iface.call(QStringLiteral("StopByGameId"), game->id());
}
@@ -765,10 +758,7 @@ void GameLauncher::onDaemonLaunchFailed(const QVariantMap &error)
void GameLauncher::syncDaemonSessions()
{
- QDBusInterface iface(kGameCenterService,
- kGameCenterPath,
- kGameCenterInterface,
- m_usingSystemBus ? QDBusConnection::systemBus() : QDBusConnection::sessionBus());
+ QDBusInterface iface(kGameCenterService, kGameCenterPath, kGameCenterInterface, QDBusConnection::sessionBus());
const QDBusReply reply = iface.call(QStringLiteral("ListSessions"));
if (!reply.isValid()) {
@@ -805,28 +795,14 @@ void GameLauncher::applyRunningStateToLibrary()
void GameLauncher::checkDaemonAvailability()
{
- const bool systemAvailable = pingDaemon(QDBusConnection::systemBus());
- const bool sessionAvailable = systemAvailable ? false : pingDaemon(QDBusConnection::sessionBus());
- const bool available = systemAvailable || sessionAvailable;
- const bool useSystemBus = systemAvailable;
+ const bool available = pingDaemon(QDBusConnection::sessionBus());
- disconnectDaemonSignals(QDBusConnection::systemBus(), this);
disconnectDaemonSignals(QDBusConnection::sessionBus(), this);
if (available) {
- connectDaemonSignals(useSystemBus ? QDBusConnection::systemBus() : QDBusConnection::sessionBus(), this);
+ connectDaemonSignals(QDBusConnection::sessionBus(), this);
}
- const bool busChanged = m_usingSystemBus != useSystemBus;
- if (busChanged) {
- m_daemonGameToSession.clear();
- m_daemonSessionToGame.clear();
- Q_EMIT runningGamesChanged();
- applyRunningStateToLibrary();
- }
-
- m_usingSystemBus = useSystemBus;
-
if (available != m_daemonAvailable) {
m_daemonAvailable = available;
Q_EMIT daemonAvailableChanged();
diff --git a/src/gamelauncher.h b/src/gamelauncher.h
index 80415b5..a4eddee 100644
--- a/src/gamelauncher.h
+++ b/src/gamelauncher.h
@@ -48,7 +48,6 @@ private:
QHash m_daemonGameToSession;
QHash m_daemonSessionToGame;
bool m_daemonAvailable = false;
- bool m_usingSystemBus = false;
void checkDaemonAvailability();
void syncDaemonSessions();
diff --git a/src/krunner/alakarterunner.cpp b/src/krunner/alakarterunner.cpp
index c28f734..febaaac 100644
--- a/src/krunner/alakarterunner.cpp
+++ b/src/krunner/alakarterunner.cpp
@@ -181,7 +181,7 @@ void AlakarteRunner::run(const KRunner::RunnerContext &context, const KRunner::Q
{QStringLiteral("origin"), QStringLiteral("krunner")},
};
- if (launchViaDaemon(QDBusConnection::systemBus(), launchSpec) || launchViaDaemon(QDBusConnection::sessionBus(), launchSpec)) {
+ if (launchViaDaemon(QDBusConnection::sessionBus(), launchSpec)) {
return;
}
}