Merge lp:~gerboland/unity-mir/use-shell-name into lp:unity-mir

[Gerry Boland]

As qtubuntu setting surface title correctly, update shell surface detection criterion to suit

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:44
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/30/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/30/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-ci/30

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-mir-ci/30/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Makes sense, i agree with your TODO though :D

We should have some property the shell sets when starting in some object

review: Approve

=== modified file 'src/unity-mir/surfacebuilder.cpp'
--- src/unity-mir/surfacebuilder.cpp	2013-08-12 11:12:48 +0000
+++ src/unity-mir/surfacebuilder.cpp	2013-08-20 11:00:40 +0000
@@ -44,7 +44,7 @@
     static const ms::DepthId shellSurfaceDepth{1};
     static bool shellSurfaceFound = false;
 
-    if (params.name == "Window 1" && !shellSurfaceFound) //TODO(greyback) Mir should identify shell surface somehow
+    if (params.name == "Qml Phone Shell" && !shellSurfaceFound) //TODO(greyback) Need to identify shell surface more securely
     {
         DLOG("Shell depth");
         auto newParams = params;