git.iko.soy/unity8
on xenial help sign in
Cleanup greeter && shell startup code
bf3af57Josh Arenson
src/ShellApplication.cpp+5−3
compare with xenial
unifiedsplit
@@ -112,11 +112,13 @@ ShellApplication::ShellApplication(int & argc, char ** argv, bool isMirServer)
112 }
112 }
113
113
114 if (parser.mode().compare("greeter") == 0) {
114 if (parser.mode().compare("greeter") == 0) {
115− m_shellView->showFullScreen();
116− if (!QProcess::startDetached("/sbin/initctl emit --no-wait unity8-greeter-started")) {
115+ QString upstartCmd = "/sbin/initctl emit --no-wait unity8-greeter-started";
116+ if (!QProcess::startDetached(upstartCmd)) {
117 qDebug() << "Unable to send unity8-greeter-started event to Upstart";
117 qDebug() << "Unable to send unity8-greeter-started event to Upstart";
118 }
118 }
119+ }
120+
119− } else if (isMirServer || parser.hasFullscreen()) {
121+ if (isMirServer || parser.hasFullscreen()) {
120 m_shellView->showFullScreen();
122 m_shellView->showFullScreen();
121 } else {
123 } else {
122 m_shellView->show();
124 m_shellView->show();