Merge lp:~mterry/unity-system-compositor/mir-fixes into lp:unity-system-compositor

[Michael Terry]

Mir trunk changed some symbols on us, so we shall follow suit.

Mir trunk changed some symbols on us, so here we are to keep pace.

I assume we don't want to make particular use of the new started() method, so I just left our override blank.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:92
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/48/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-saucy-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-saucy-armhf-ci/17

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

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

Makes sense to me as long as that version of Mir is available.

review: Approve

[Daniel van Vugt (vanvugt)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-autolanding/39/
Executed test runs:
    FAILURE: http://10.97.0.26:8080/job/generic-cleanup-mbs/2939/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-trusty-amd64-autolanding/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-trusty-armhf-autolanding/1/console

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Oh, of course. CI will fail until the Mir 0.1.0 packages are released :/

[Timo Jyrinki (timo-jyrinki)]

Tested with the daily-build PPA that merging this will fix building against libmirserver8. Merging manually.

review: Approve

[Timo Jyrinki (timo-jyrinki)]

...the only problem being that meanwhile there's libmirserver9 which new problems for u-s-c. Let's see.

=== modified file 'debian/control'
--- debian/control	2013-10-14 19:39:39 +0000
+++ debian/control	2013-10-21 19:36:26 +0000
@@ -6,7 +6,7 @@
                cmake-data,
                debhelper (>= 9),
                libboost1.48-all-dev | libboost-all-dev,
-               libmirserver-dev (>= 0.0.15),
+               libmirserver-dev (>= 0.0.16),
                libgles2-mesa-dev,
                libprotobuf-dev,
                pkg-config,

=== modified file 'src/system_compositor.cpp'
--- src/system_compositor.cpp	2013-09-30 16:52:36 +0000
+++ src/system_compositor.cpp	2013-10-21 19:36:26 +0000
@@ -20,7 +20,7 @@
 
 #include <mir/run_mir.h>
 #include <mir/abnormal_exit.h>
-#include <mir/pause_resume_listener.h>
+#include <mir/server_status_listener.h>
 #include <mir/shell/application_session.h>
 #include <mir/shell/session.h>
 #include <mir/shell/session_container.h>
@@ -98,11 +98,11 @@
         return std::make_shared<NullCursorListener>();
     }
 
-    std::shared_ptr<mir::PauseResumeListener> the_pause_resume_listener() override
+    std::shared_ptr<mir::ServerStatusListener> the_server_status_listener() override
     {
-        struct PauseResumeListener : public mir::PauseResumeListener
+        struct ServerStatusListener : public mir::ServerStatusListener
         {
-            PauseResumeListener (SystemCompositor *compositor) : compositor{compositor} {}
+            ServerStatusListener (SystemCompositor *compositor) : compositor{compositor} {}
 
             void paused() override
             {
@@ -114,9 +114,13 @@
                 compositor->resume();
             }
 
+            void started() override
+            {
+            }
+
             SystemCompositor *compositor;
         };
-        return std::make_shared<PauseResumeListener>(compositor);
+        return std::make_shared<ServerStatusListener>(compositor);
     }
 
     std::string get_socket_file()