Merge lp:~unity-team/qtmir/rtm-14.09-staging into lp:qtmir/rtm-14.09

[Michael Zanetti]

Backport to RTM:

- Bug #1394208

[Gerry Boland (gerboland)]

review: Approve

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2014-10-30 11:55:15 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2014-12-16 21:28:14 +0000
@@ -167,6 +167,15 @@
     connectToSessionAuthorizer(appManager, sessionAuthorizer);
     connectToTaskController(appManager, taskController.data());
 
+    // Emit signal to notify Upstart that Mir is ready to receive client connections
+    // see http://upstart.ubuntu.com/cookbook/#expect-stop
+    // FIXME: should not be qtmir's job, instead should notify the user of this library
+    // that they should emit this signal, perhaps by posting an event to the
+    // QMirServerApplication event loop when it comes up
+    if (qgetenv("UNITY_MIR_EMITS_SIGSTOP") == "1") {
+        raise(SIGSTOP);
+    }
+
     return appManager;
 }
 

=== modified file 'src/platforms/mirserver/mirserverstatuslistener.cpp'
--- src/platforms/mirserver/mirserverstatuslistener.cpp	2014-07-01 13:38:06 +0000
+++ src/platforms/mirserver/mirserverstatuslistener.cpp	2014-12-16 21:28:14 +0000
@@ -34,12 +34,4 @@
 
 void MirServerStatusListener::started()
 {
-    // Emit signal to notify Upstart that Mir is ready to receive client connections
-    // see http://upstart.ubuntu.com/cookbook/#expect-stop
-    // FIXME: should not be qtmir's job, instead should notify the user of this library
-    // that they should emit this signal, perhaps by posting an event to the
-    // QMirServerApplication event loop when it comes up
-    if (qgetenv("UNITY_MIR_EMITS_SIGSTOP") == "1") {
-        raise(SIGSTOP);
-    }
 }