marcoallegretti/a-la-karte
marcoallegretti/a-la-karte
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/a-la-karte.git synced 2026-03-26 17:03:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gamecenter: move DBus object path to avoid KDBusService conflict

Browse source
This commit is contained in:
Marco Allegretti 2026-02-14 12:42:18 +01:00
parent cca49615d6
commit d4e0326974
6 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gamecenter/gamecenterdaemon.cpp
View file

@ -928,11 +928,8 @@ bool GameCenterDaemon::init()
return false;
}
if (!bus.registerService(QStringLiteral("org.kde.GameCenter1"))) {
return false;
}
if (!bus.registerObject(QStringLiteral("/org/kde/GameCenter1"), this, QDBusConnection::ExportAllSlots | QDBusConnection::ExportAllSignals)) {
if (!bus.registerObject(QStringLiteral("/org/kde/ALaKarte/GameCenter1"), this, QDBusConnection::ExportAllSlots | QDBusConnection::ExportAllSignals)) {
qWarning() << "Failed to register D-Bus object" << bus.lastError().name() << bus.lastError().message();
return false;
}

11
src/gamecenter/main.cpp
View file

@ -16,9 +16,7 @@ int main(int argc, char *argv[])
{
QCoreApplication app(argc, argv);
app.setOrganizationDomain(QStringLiteral("kde.org"));
app.setApplicationName(QStringLiteral("alakarte_gamecenter"));
KDBusService service(KDBusService::Unique);
app.setApplicationName(QStringLiteral("GameCenter1"));
QCommandLineParser parser;
parser.setApplicationDescription(QStringLiteral("A-La-Karte Game Center"));
@ -27,6 +25,13 @@ int main(int argc, char *argv[])
GameCenterDaemon daemon;
if (!daemon.init()) {
qWarning() << "GameCenter daemon initialization failed";
return 1;
}
KDBusService service(KDBusService::Unique | KDBusService::NoExitOnFailure);
if (!service.isRegistered()) {
qWarning() << "Failed to register D-Bus service" << service.serviceName() << service.errorMessage();
return 1;
}

2
src/gamelauncher.cpp
View file

@ -20,7 +20,7 @@
#include <QTimer>
static const QString kGameCenterService = QStringLiteral("org.kde.GameCenter1");
static const QString kGameCenterPath = QStringLiteral("/org/kde/GameCenter1");
static const QString kGameCenterPath = QStringLiteral("/org/kde/ALaKarte/GameCenter1");
static const QString kGameCenterInterface = QStringLiteral("org.kde.GameCenter1");
static const QString kRunnerService = QStringLiteral("org.kde.ALaKarte.Runner1");

2
src/krunner/alakarterunner.cpp
View file

@ -18,7 +18,7 @@
K_PLUGIN_CLASS_WITH_JSON(AlakarteRunner, "plasma-runner-alakarte.json")
static const QString kGameCenterService = QStringLiteral("org.kde.GameCenter1");
static const QString kGameCenterPath = QStringLiteral("/org/kde/GameCenter1");
static const QString kGameCenterPath = QStringLiteral("/org/kde/ALaKarte/GameCenter1");
static const QString kGameCenterInterface = QStringLiteral("org.kde.GameCenter1");
static bool launchViaDaemon(QDBusConnection bus, const QVariantMap &launchSpec)

2
tests/dbus_smoketest.cpp
View file

@ -234,7 +234,7 @@ void DbusSmokeTest::cleanupTestCase()
void DbusSmokeTest::pingGameCenter()
{
QDBusInterface iface(QStringLiteral("org.kde.GameCenter1"), QStringLiteral("/org/kde/GameCenter1"), QStringLiteral("org.kde.GameCenter1"), m_bus);
QDBusInterface iface(QStringLiteral("org.kde.GameCenter1"), QStringLiteral("/org/kde/ALaKarte/GameCenter1"), QStringLiteral("org.kde.GameCenter1"), m_bus);
QVERIFY(iface.isValid());
iface.setTimeout(2000);

12
tests/stop_launching_regression_test.cpp
View file

@ -358,7 +358,7 @@ void StopLaunchingRegressionTest::stopWhileLaunchingSteam()
QSKIP("session bus not available");
}
QDBusInterface iface(QStringLiteral("org.kde.GameCenter1"), QStringLiteral("/org/kde/GameCenter1"), QStringLiteral("org.kde.GameCenter1"), bus);
QDBusInterface iface(QStringLiteral("org.kde.GameCenter1"), QStringLiteral("/org/kde/ALaKarte/GameCenter1"), QStringLiteral("org.kde.GameCenter1"), bus);
QVERIFY2(iface.isValid(), "GameCenter1 DBus interface not valid");
const QString appId = QStringLiteral("987654");
@ -396,7 +396,7 @@ void StopLaunchingRegressionTest::stopByGameIdWhileLaunchingSteam()
QSKIP("session bus not available");
}
QDBusInterface iface(QStringLiteral("org.kde.GameCenter1"), QStringLiteral("/org/kde/GameCenter1"), QStringLiteral("org.kde.GameCenter1"), bus);
QDBusInterface iface(QStringLiteral("org.kde.GameCenter1"), QStringLiteral("/org/kde/ALaKarte/GameCenter1"), QStringLiteral("org.kde.GameCenter1"), bus);
QVERIFY2(iface.isValid(), "GameCenter1 DBus interface not valid");
const QByteArray markerNeedle = (QStringLiteral("ALAKARTE_TEST_MARKER=") + m_markerValue).toUtf8();
@ -438,7 +438,7 @@ void StopLaunchingRegressionTest::stopWhileLaunchingLutris()
QSKIP("session bus not available");
}
QDBusInterface iface(QStringLiteral("org.kde.GameCenter1"), QStringLiteral("/org/kde/GameCenter1"), QStringLiteral("org.kde.GameCenter1"), bus);
QDBusInterface iface(QStringLiteral("org.kde.GameCenter1"), QStringLiteral("/org/kde/ALaKarte/GameCenter1"), QStringLiteral("org.kde.GameCenter1"), bus);
QVERIFY2(iface.isValid(), "GameCenter1 DBus interface not valid");
const QByteArray markerNeedle = (QStringLiteral("ALAKARTE_TEST_MARKER=") + m_markerValue).toUtf8();
@ -476,7 +476,7 @@ void StopLaunchingRegressionTest::stopByGameIdWhileLaunchingLutris()
QSKIP("session bus not available");
}
QDBusInterface iface(QStringLiteral("org.kde.GameCenter1"), QStringLiteral("/org/kde/GameCenter1"), QStringLiteral("org.kde.GameCenter1"), bus);
QDBusInterface iface(QStringLiteral("org.kde.GameCenter1"), QStringLiteral("/org/kde/ALaKarte/GameCenter1"), QStringLiteral("org.kde.GameCenter1"), bus);
QVERIFY2(iface.isValid(), "GameCenter1 DBus interface not valid");
const QByteArray markerNeedle = (QStringLiteral("ALAKARTE_TEST_MARKER=") + m_markerValue).toUtf8();
@ -514,7 +514,7 @@ void StopLaunchingRegressionTest::stopDirectLaunch()
QSKIP("session bus not available");
}
QDBusInterface iface(QStringLiteral("org.kde.GameCenter1"), QStringLiteral("/org/kde/GameCenter1"), QStringLiteral("org.kde.GameCenter1"), bus);
QDBusInterface iface(QStringLiteral("org.kde.GameCenter1"), QStringLiteral("/org/kde/ALaKarte/GameCenter1"), QStringLiteral("org.kde.GameCenter1"), bus);
QVERIFY2(iface.isValid(), "GameCenter1 DBus interface not valid");
const QByteArray markerNeedle = (QStringLiteral("ALAKARTE_TEST_MARKER=") + m_markerValue).toUtf8();
@ -561,7 +561,7 @@ void StopLaunchingRegressionTest::stopByGameIdDirectLaunch()
QSKIP("session bus not available");
}
QDBusInterface iface(QStringLiteral("org.kde.GameCenter1"), QStringLiteral("/org/kde/GameCenter1"), QStringLiteral("org.kde.GameCenter1"), bus);
QDBusInterface iface(QStringLiteral("org.kde.GameCenter1"), QStringLiteral("/org/kde/ALaKarte/GameCenter1"), QStringLiteral("org.kde.GameCenter1"), bus);
QVERIFY2(iface.isValid(), "GameCenter1 DBus interface not valid");
const QByteArray markerNeedle = (QStringLiteral("ALAKARTE_TEST_MARKER=") + m_markerValue).toUtf8();