Differential D23023 Diff 63357 startkde/startplasma-x11.cpp

Changeset View

Standalone View

View Options

startkde/startplasma-x11.cpp

Show All 23 Lines
24#include <KConfig> 24​#include <KConfig>
25#include <KConfigGroup> 25​#include <KConfigGroup>
26 26​
27void sighupHandler(int) 27​void sighupHandler(int)
28{ 28​{
29 out << "GOT SIGHUP\n"; 29​ out << "GOT SIGHUP\n";
30} 30​}
31 31​
32int main(int /*argc*/, char** /*argv*/) 32​int main(int argc, char** argv)
33{ 33​{
34 // When the X server dies we get a HUP signal from xinit. We must ignore it 34​ // When the X server dies we get a HUP signal from xinit. We must ignore it
35 // because we still need to do some cleanup. 35​ // because we still need to do some cleanup.
36 signal(SIGHUP, sighupHandler); 36​ signal(SIGHUP, sighupHandler);
37 37​
38 // Boot sequence: 38​ // Boot sequence:
39 // 39​ //
40 // kdeinit is used to fork off processes which improves memory usage 40​ // kdeinit is used to fork off processes which improves memory usage
▲ Show 20 Lines • Show All 44 Lines • ▼ Show 20 Line(s)
85 setupCursor(false); 85​ setupCursor(false);
86 setupFontDpi(); 86​ setupFontDpi();
87 QScopedPointer<QProcess, KillBeforeDeleter> ksplash(setupKSplash()); 87​ QScopedPointer<QProcess, KillBeforeDeleter> ksplash(setupKSplash());
88 88​
89 runEnvironmentScripts(); 89​ runEnvironmentScripts();
90 90​
91 out << "startkde: Starting up...\n"; 91​ out << "startkde: Starting up...\n";
92 92​
93 setupPlasmaEnvironment(); 93​ QString plasmaShell = QStringLiteral("org.kde.plasma.desktop");
94​ if (argc > 1) {
95​ plasmaShell = QString::fromLatin1(argv[1]);
96​ }
97​
98​ setupPlasmaEnvironment(plasmaShell);
94 setupX11(); 99​ setupX11();
95 100​
96 if (!syncDBusEnvironment()) { 101​ if (!syncDBusEnvironment()) {
97 // Startup error 102​ // Startup error
98 messageBox(QStringLiteral("Could not sync environment to dbus.\n")); 103​ messageBox(QStringLiteral("Could not sync environment to dbus.\n"));
99 return 1; 104​ return 1;
100 } 105​ }
101 106​
Show All 21 Lines