Differential D27868 Diff 77035 startkde/plasma-session/startup.cpp

Changeset View

Standalone View

View Options

startkde/plasma-session/startup.cpp

Show First 20 Lines • Show All 56 Lines • ▼ Show 20 Line(s)
57#include <QDBusPendingCall> 57​#include <QDBusPendingCall>
58#include <QDir> 58​#include <QDir>
59#include <QStandardPaths> 59​#include <QStandardPaths>
60#include <QTimer> 60​#include <QTimer>
61#include <QProcess> 61​#include <QProcess>
62 62​
63#include "startupadaptor.h" 63​#include "startupadaptor.h"
64 64​
65​#include "../config-startplasma.h"
66​
65class Phase: public KCompositeJob 67​class Phase: public KCompositeJob
66{ 68​{
67Q_OBJECT 69​Q_OBJECT
68public: 70​public:
69 Phase(const AutoStart &autostart, QObject *parent) 71​ Phase(const AutoStart &autostart, QObject *parent)
70 : KCompositeJob(parent) 72​ : KCompositeJob(parent)
71 , m_autostart(autostart) 73​ , m_autostart(autostart)
72 {} 74​ {}
▲ Show 20 Lines • Show All 128 Lines • ▼ Show 20 Line(s)
201{ 203​{
202 new StartupAdaptor(this); 204​ new StartupAdaptor(this);
203 QDBusConnection::sessionBus().registerObject(QStringLiteral("/Startup"), QStringLiteral("org.kde.Startup"), this); 205​ QDBusConnection::sessionBus().registerObject(QStringLiteral("/Startup"), QStringLiteral("org.kde.Startup"), this);
204 QDBusConnection::sessionBus().registerService(QStringLiteral("org.kde.Startup")); 206​ QDBusConnection::sessionBus().registerService(QStringLiteral("org.kde.Startup"));
205 207​
206 upAndRunning(QStringLiteral("ksmserver")); 208​ upAndRunning(QStringLiteral("ksmserver"));
207 const AutoStart autostart; 209​ const AutoStart autostart;
208 210​
211​ QProcess::execute(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit_wrapper"));
212​
209 KJob* phase1; 213​ KJob* phase1;
210 QProcessEnvironment kdedProcessEnv; 214​ QProcessEnvironment kdedProcessEnv;
211 kdedProcessEnv.insert(QStringLiteral("KDED_STARTED_BY_KDEINIT"), QStringLiteral("1")); 215​ kdedProcessEnv.insert(QStringLiteral("KDED_STARTED_BY_KDEINIT"), QStringLiteral("1"));
212 216​
213 const QVector<KJob*> sequence = { 217​ const QVector<KJob*> sequence = {
214 new StartProcessJob(QStringLiteral("kcminit_startup"), {}), 218​ new StartProcessJob(QStringLiteral("kcminit_startup"), {}),
215 new StartServiceJob(QStringLiteral("kded5"), {}, QStringLiteral("org.kde.kded5"), kdedProcessEnv), 219​ new StartServiceJob(QStringLiteral("kded5"), {}, QStringLiteral("org.kde.kded5"), kdedProcessEnv),
216 new StartServiceJob(QStringLiteral("ksmserver"), QCoreApplication::instance()->arguments().mid(1), QStringLiteral("org.kde.ksmserver")), 220​ new StartServiceJob(QStringLiteral("ksmserver"), QCoreApplication::instance()->arguments().mid(1), QStringLiteral("org.kde.ksmserver")),
▲ Show 20 Lines • Show All 252 Lines • Show Last 20 Lines