8662115 · unity8 · git.iko.soy

on xenial help sign in

Start maliit-server in greeter

8662115Michael Terry13 years ago

plugins/LightDM/Upstart.cpp+5−1

@@ -69,7 +69,11 @@ Upstart::Upstart(QObject *parent)

69 if (QString(qgetenv("UPSTART_SESSION")).isEmpty())

70 {

71 QProcess *upstart = new QProcess(this);

72− upstart->start("/sbin/init --user --startup-event=unity8-greeter-started");

72+ QString command = "/sbin/init --user --startup-event=unity8-greeter-started";

73+ // in main.cpp, we convert client to server. Convert back here.

74+ if (qgetenv("QT_QPA_PLATFORM") == "ubuntumirserver")

75+ command.prepend("/usr/bin/env QT_QPA_PLATFORM=ubuntumirclient ");

76+ upstart->start(command);

73 }

77 }

74}

78}

plugins/LightDM/unity8-greeter-init.conf+3−2

@@ -6,6 +6,7 @@ emits indicator-services-start

6task

8script

9− initctl emit indicator-services-start

9+ initctl emit --no-wait indicator-services-start

10− initctl start ofono-setup

10+ initctl start --no-wait ofono-setup || true

11+ initctl start --no-wait maliit-server || true

11end script

12end script