Merge lp:~kdub/unity-system-compositor/mir-surface-update into lp:unity-system-compositor

[Kevin DuBois]

some changes adding some more functions to SystemCompositorSurface needed to accommodate changes in lp:mir/devel.

some changes adding some more functions to SystemCompositorSurface needed to accommodate changes in lp:mir/devel.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:138
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/115/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-utopic-amd64-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-utopic-armhf-ci/11/console

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

review: Needs Fixing (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Not needed any more.

Unmerged revisions

138. By Kevin DuBois on 2014-06-06

fix api breakage with lp:mir/devel

=== modified file 'src/system_compositor.cpp'
--- src/system_compositor.cpp	2014-06-03 15:48:25 +0000
+++ src/system_compositor.cpp	2014-06-06 23:38:17 +0000
@@ -120,6 +120,16 @@
         return self;
     }
 
+    void set_cursor_image(std::shared_ptr<mg::CursorImage> const& image) override
+    {
+        self->set_cursor_image(image);
+    }
+    
+    std::shared_ptr<mg::CursorImage> cursor_image() override
+    {
+        return self->cursor_image();
+    }
+
     void swap_buffers(mg::Buffer* old_buffer, std::function<void(mg::Buffer* new_buffer)> complete) override
     {
         self->swap_buffers(old_buffer, complete);