diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp index d0c83bf5a..ed496cc24 100644 --- a/startkde/startplasma-waylandsession.cpp +++ b/startkde/startplasma-waylandsession.cpp @@ -41,7 +41,6 @@ int main(int argc, char **argv) // Keep for KF5; remove in KF6 (KInit will be gone then) runSync(QStringLiteral("kdeinit5_shutdown"), {}); - cleanupX11(); out << "startplasma-waylandsession: Done.\n"; return 0; diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp index 7ddf7b3ea..d6b2c5439 100644 --- a/startkde/startplasma-x11.cpp +++ b/startkde/startplasma-x11.cpp @@ -93,7 +93,6 @@ int main(int argc, char **argv) runSync(QStringLiteral("kdeinit5_shutdown"), {}); cleanupPlasmaEnvironment(oldSystemdEnvironment); - cleanupX11(); out << "startkde: Done.\n"; diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp index 570afed57..699d048e4 100644 --- a/startkde/startplasma.cpp +++ b/startkde/startplasma.cpp @@ -336,28 +336,6 @@ void setupX11() // so don't move this up. runSync(QStringLiteral("xsetroot"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")}); - runSync(QStringLiteral("xprop"), - {QStringLiteral("-root"), - QStringLiteral("-f"), - QStringLiteral("KDE_FULL_SESSION"), - QStringLiteral("8t"), - QStringLiteral("-set"), - QStringLiteral("KDE_FULL_SESSION"), - QStringLiteral("true")}); - runSync(QStringLiteral("xprop"), - {QStringLiteral("-root"), - QStringLiteral("-f"), - QStringLiteral("KDE_SESSION_VERSION"), - QStringLiteral("32c"), - QStringLiteral("-set"), - QStringLiteral("KDE_SESSION_VERSION"), - QStringLiteral("5")}); -} - -void cleanupX11() -{ - runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_FULL_SESSION")}); - runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_SESSION_VERSION")}); } void cleanupPlasmaEnvironment(const std::optional &oldSystemdEnvironment) diff --git a/startkde/startplasma.h b/startkde/startplasma.h index 00c5c1570..e8684be74 100644 --- a/startkde/startplasma.h +++ b/startkde/startplasma.h @@ -26,7 +26,6 @@ void importSystemdEnvrionment(); void runEnvironmentScripts(); void setupPlasmaEnvironment(); void cleanupPlasmaEnvironment(const std::optional &oldSystemdEnvironment); -void cleanupX11(); bool syncDBusEnvironment(); void setupFontDpi(); QProcess *setupKSplash();