Commit 45ca3109 authored by David Edmundson's avatar David Edmundson

[plasma-session] Continue to start kdeinit

Summary:
This was a deliberate decision to remove this in
c673a832

The logic being that kdeinit should auto launch itself if required.

In practice this exposes a presumably pre-existing bug in kdeinit
autostarting where the env is not set correctly.

Test Plan:
 qdbus org.kde.klauncher5 /KLauncher org.kde.KLauncher.exec_blind /opt/kde5/bin/kate ""

kate opened

Reviewers: #plasma, broulik

Reviewed By: #plasma, broulik

Subscribers: broulik, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D27868
parent eb4235ea
......@@ -62,6 +62,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "startupadaptor.h"
#include "../config-startplasma.h"
class Phase: public KCompositeJob
{
Q_OBJECT
......@@ -206,6 +208,8 @@ Startup::Startup(QObject *parent):
upAndRunning(QStringLiteral("ksmserver"));
const AutoStart autostart;
QProcess::execute(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit_wrapper"));
KJob* phase1;
QProcessEnvironment kdedProcessEnv;
kdedProcessEnv.insert(QStringLiteral("KDED_STARTED_BY_KDEINIT"), QStringLiteral("1"));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment