Merge lp:~vthompson/unity-mir/fixes-1241045 into lp:unity-mir

[Victor Thompson]

Fix mir to not suspend the music-app, or any other app granted a lifecycle exception, when switching between apps.

Fix mir to not suspend the music-app, or any other app granted a lifecycle exception, when switching between apps.

[Gerry Boland (gerboland)]

Look good to me, thanks for this Victor!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mir-autolanding/97/
Executed test runs:
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3422/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-autolanding/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-autolanding/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-autolanding/19/console

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

Landing failed as Mir has progressed to 0.1.2 and this MR needs to land first: https://code.launchpad.net/~gerboland/unity-mir/0.1.2-supprt/+merge/196693
So holding off until then

[Gerry Boland (gerboland)]

Ok trying again

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2013-11-15 17:53:17 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2013-11-23 06:15:06 +0000
@@ -545,7 +545,7 @@
         return;
 
     // set state of previously focused app to suspended
-    if (m_focusedApplication && !m_lifecycleExceptions.contains(m_focusedApplication->appId())) {
+    if (m_focusedApplication && m_lifecycleExceptions.filter(m_focusedApplication->appId().section('_',0,0)).empty()) {
         m_focusedApplication->setState(Application::Suspended);
     }