Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c1635c971d9f7f11862e9a400c344f748ca0ce00
commit c1635c971d9f7f11862e9a400c344f748ca0ce00 Author: crazy <[email protected]> Date: Fri Oct 7 14:36:51 2016 +0200 plasma-workspace-5.7.5-2-x86_64 * beore I forget add kcminit_startup patch bc is br0ken in 5.8.0 diff --git a/source/plasma/plasma-workspace/plasma-workspace-kcminit.5.8.0.patch b/source/plasma/plasma-workspace/plasma-workspace-kcminit.5.8.0.patch new file mode 100644 index 0000000..2a63cbf --- /dev/null +++ b/source/plasma/plasma-workspace/plasma-workspace-kcminit.5.8.0.patch @@ -0,0 +1,39 @@ +Any KCMinit module which are at X-KDE-Init-Phase=1 or 2 will now get +run. It also means kcminit_startup closes, instead of lingersing on +startup doing nothing until it times out 5 minutes later. + +Test Plan: Confirmed kcminit_startup now exits properly. + +Reviewers: #plasma, apol + +Reviewed By: apol + +Subscribers: plasma-devel + +Tags: #plasma + +Differential Revision: https://phabricator.kde.org/D2887 +--- + + +--- a/startkde/kcminit/main.cpp ++++ b/startkde/kcminit/main.cpp +@@ -212,6 +212,10 @@ + + sendReady(); + QTimer::singleShot( 300 * 1000, qApp, &QCoreApplication::quit); // just in case ++ ++ QDBusConnection::sessionBus().registerObject(QStringLiteral("/kcminit"), this, QDBusConnection::ExportScriptableContents); ++ QDBusConnection::sessionBus().registerService(QStringLiteral("org.kde.kcminit")); ++ + qApp->exec(); // wait for runPhase1() and runPhase2() + } + else +@@ -266,8 +270,6 @@ + about.processCommandLine(&parser); + + KCMInit kcminit( parser ); +- QDBusConnection::sessionBus().registerObject(QStringLiteral("/kcminit"), &kcminit, QDBusConnection::ExportScriptableContents); +- QDBusConnection::sessionBus().registerService(QStringLiteral("org.kde.kcminit")); + return 0; + } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
