diff --git a/src/gamecenter/gamecenterdaemon.cpp b/src/gamecenter/gamecenterdaemon.cpp index 29cdfc1..933001c 100644 --- a/src/gamecenter/gamecenterdaemon.cpp +++ b/src/gamecenter/gamecenterdaemon.cpp @@ -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; } diff --git a/src/gamecenter/main.cpp b/src/gamecenter/main.cpp index 717bd6f..8c8be40 100644 --- a/src/gamecenter/main.cpp +++ b/src/gamecenter/main.cpp @@ -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; } diff --git a/src/gamelauncher.cpp b/src/gamelauncher.cpp index a80e178..217daae 100644 --- a/src/gamelauncher.cpp +++ b/src/gamelauncher.cpp @@ -20,7 +20,7 @@ #include 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"); diff --git a/src/krunner/alakarterunner.cpp b/src/krunner/alakarterunner.cpp index 1418985..c28f734 100644 --- a/src/krunner/alakarterunner.cpp +++ b/src/krunner/alakarterunner.cpp @@ -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) diff --git a/tests/dbus_smoketest.cpp b/tests/dbus_smoketest.cpp index e8d5715..b3aaaa6 100644 --- a/tests/dbus_smoketest.cpp +++ b/tests/dbus_smoketest.cpp @@ -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); diff --git a/tests/stop_launching_regression_test.cpp b/tests/stop_launching_regression_test.cpp index 0cde51c..fc09bb9 100644 --- a/tests/stop_launching_regression_test.cpp +++ b/tests/stop_launching_regression_test.cpp @@ -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();