Merge lp:~alan-griffiths/unity-system-compositor/dont-use-ApplicationSession into lp:unity-system-compositor

[Alan Griffiths]

ApplicationSession is a Mir implementation class that shouldn't be used by USC. Use shell::Session instead

ApplicationSession is a Mir implementation class that shouldn't be used by USC. Use shell::Session instead

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:94
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/51/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-trusty-amd64-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-trusty-armhf-ci/3/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-system-compositor-ci/51/rebuild

review: Needs Fixing (continuous-integration)

[Robert Carr (robertcarr)]

LGTM. Needs mir merge from dev branch to build though.

[Robert Carr (robertcarr)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:94
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/57/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-trusty-amd64-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-trusty-armhf-ci/9/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-system-compositor-ci/57/rebuild

review: Needs Fixing (continuous-integration)

[lp:~alan-griffiths/unity-system-compositor/dont-use-ApplicationSession]

95. By Alan Griffiths on 2013-11-12

merge lp:unity-system-compositor

96. By Alan Griffiths on 2013-11-13

Delete unused code

97. By Alan Griffiths on 2013-11-13

mir/shell/focus_setter.h has gone private, use mir/shell/focus_controller.h instead

98. By Alan Griffiths on 2013-11-13

merge lp:~alan-griffiths/unity-system-compositor/fix-local-build

[Alan Griffiths (alan-griffiths)]

Don't use FocusSetter either - use FocusController instead.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:98
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/62/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-trusty-amd64-ci/14/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-trusty-armhf-ci/14

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-system-compositor-ci/62/rebuild

review: Needs Fixing (continuous-integration)

[lp:~alan-griffiths/unity-system-compositor/dont-use-ApplicationSession]

99. By Alan Griffiths on 2013-11-20

merge lp:unity-system-compositor

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:99
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/65/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-trusty-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-trusty-armhf-ci/17

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/65/rebuild

review: Approve (continuous-integration)

[Thomas Voß (thomas-voss)]

LGTM, tested locally and works.

review: Approve

=== modified file 'src/dm_connection.h'
--- src/dm_connection.h	2013-07-09 19:18:59 +0000
+++ src/dm_connection.h	2013-11-20 11:00:31 +0000
@@ -28,13 +28,6 @@
     virtual void set_next_session(std::string client_name) = 0;
 };
 
-class NullDMMessageHandler : public DMMessageHandler
-{
-public:
-    void set_active_session(std::string client_name) {};
-    void set_next_session(std::string client_name) {};
-};
-
 enum class USCMessageID
 {
     ping = 0,

=== modified file 'src/system_compositor.cpp'
--- src/system_compositor.cpp	2013-11-05 23:36:07 +0000
+++ src/system_compositor.cpp	2013-11-20 11:00:31 +0000
@@ -22,10 +22,9 @@
 #include <mir/run_mir.h>
 #include <mir/abnormal_exit.h>
 #include <mir/server_status_listener.h>
-#include <mir/shell/application_session.h>
 #include <mir/shell/session.h>
 #include <mir/shell/session_container.h>
-#include <mir/shell/focus_setter.h>
+#include <mir/shell/focus_controller.h>
 #include <mir/input/cursor_listener.h>
 
 #include <cerrno>
@@ -238,19 +237,17 @@
     active_session.reset();
     config->the_shell_session_container()->for_each([&](std::shared_ptr<msh::Session> const& s)
     {
-        auto app_session(std::static_pointer_cast<msh::ApplicationSession>(s));
-
         if (s->name() == client_name)
         {
-            app_session->set_lifecycle_state(mir_lifecycle_state_resumed);
-            active_session = app_session;
+            s->set_lifecycle_state(mir_lifecycle_state_resumed);
+            active_session = s;
         }
         else
-            app_session->set_lifecycle_state(mir_lifecycle_state_will_suspend);
+            s->set_lifecycle_state(mir_lifecycle_state_will_suspend);
     });
 
     if (active_session)
-        config->the_shell_focus_setter()->set_focus_to(active_session);
+        config->the_focus_controller()->set_focus_to(active_session);
     else
         std::cerr << "Unable to set active session, unknown client name " << client_name << std::endl;
 }

=== modified file 'src/system_compositor.h'
--- src/system_compositor.h	2013-10-31 22:35:26 +0000
+++ src/system_compositor.h	2013-11-20 11:00:31 +0000
@@ -22,7 +22,7 @@
 #include "dm_connection.h"
 
 #include <mir/default_server_configuration.h>
-#include <mir/shell/application_session.h>
+#include <mir/shell/session.h>
 
 class Configuration;
 
@@ -37,7 +37,7 @@
     std::shared_ptr<mir::DefaultServerConfiguration> config;
     boost::asio::io_service io_service;
     std::shared_ptr<DMConnection> dm_connection;
-    std::shared_ptr<mir::shell::ApplicationSession> active_session;
+    std::shared_ptr<mir::shell::Session> active_session;
 
     void set_active_session(std::string client_name);
     void set_next_session(std::string client_name);