Merge lp:~ricmm/unity-mir/respect-lifecycle-stages into lp:unity-mir

[Ricardo Mendoza]

Correctly respect lifecycle exceptions in the new sidestage model.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:168
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/226/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/89
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/90
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/90/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/89

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Tested on mako & manta, works fine. Code logical. Approved

review: Approve

[Łukasz Zemczak (sil2100)]

+1, the code looks good as well.

review: Approve

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2014-01-09 15:34:29 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2014-01-16 12:04:26 +0000
@@ -203,6 +203,19 @@
     }
 }
 
+void ApplicationManager::suspendApplication(Application *application)
+{
+    if (application == nullptr)
+        return;
+
+    // Present in exceptions list, return.
+    if (!m_lifecycleExceptions.filter(application->appId().section('_',0,0)).empty())
+        return;
+
+    if (application->state() == Application::Running)
+        application->setState(Application::Suspended);
+}
+
 bool ApplicationManager::focusApplication(const QString &appId)
 {
     DLOG("ApplicationManager::focusApplication (this=%p, appId=%s)", this, qPrintable(appId));
@@ -213,10 +226,8 @@
         return false;
     }
    
-    if (application->stage() == Application::MainStage && m_sideStageApplication &&
-           (m_sideStageApplication->state() == Application::Running)) {
-        m_sideStageApplication->setState(Application::Suspended);
-    }
+    if (application->stage() == Application::MainStage && m_sideStageApplication)
+        suspendApplication(m_sideStageApplication);
     
     if (application->stage() == Application::MainStage)
         m_msApplicationToBeFocused = application;
@@ -244,11 +255,8 @@
 {
     DLOG("ApplicationManager::unfocusCurrentApplication (this=%p)", this);
 
-    if (m_sideStageApplication)
-        m_sideStageApplication->setState(Application::Suspended);
-
-    if (m_mainStageApplication)
-        m_mainStageApplication->setState(Application::Suspended);
+    suspendApplication(m_sideStageApplication);
+    suspendApplication(m_mainStageApplication);
 
     // Clear both stages
     m_msApplicationToBeFocused = nullptr;
@@ -615,11 +623,8 @@
     if (NULL != m_focusedApplication) {
         Q_ASSERT(m_focusedApplication->focused());
         m_focusedApplication->setFocused(false);
-
-        if (m_lifecycleExceptions.filter(m_focusedApplication->appId().section('_',0,0)).empty()
-                && m_focusedApplication->state() != Application::Suspended) {
-            m_focusedApplication->setState(Application::Suspended);
-        }
+        
+        suspendApplication(m_focusedApplication);
 
         m_focusedApplication = NULL;
         Q_EMIT focusedApplicationIdChanged();
@@ -656,8 +661,7 @@
     // set state of previously focused app to suspended
     if (m_focusedApplication && m_lifecycleExceptions.filter(m_focusedApplication->appId().section('_',0,0)).empty()) {
         Application *lastApplication = applicationForStage(application->stage());
-        if (lastApplication && lastApplication->state() == Application::Running)
-            lastApplication->setState(Application::Suspended);
+        suspendApplication(lastApplication);
     }
 
     if (application->stage() == Application::MainStage)

=== modified file 'src/modules/Unity/Application/application_manager.h'
--- src/modules/Unity/Application/application_manager.h	2013-12-20 03:38:43 +0000
+++ src/modules/Unity/Application/application_manager.h	2014-01-16 12:04:26 +0000
@@ -86,6 +86,7 @@
     Application* findApplicationWithPid(const qint64 pid);
 
     // Internal helpers
+    void suspendApplication(Application *application);
     int panelHeight();
     QSize displaySize() const { return m_displaySize; }