bugfix: initial_placement_done is only available on Mir >= 2.19 (#459)

Author: mattkae

src/forwarding_surface.cpp

@@ -146,9 +146,11 @@ void ForwardingSurface::unregister_interest(const mir::scene::SurfaceObserver& o
     surface_->unregister_interest(observer);
 }
 
+#if (MIR_SERVER_MAJOR_VERSION > 2) || (MIR_SERVER_MAJOR_VERSION == 2 && MIR_SERVER_MINOR_VERSION >= 19)
 void ForwardingSurface::initial_placement_done()
 {
 }
+#endif
 
 std::string ForwardingSurface::name() const
 {

src/forwarding_surface.h

@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ANIMATING_SURFACE_H
 
 #include <mir/scene/surface.h>
+#include <mir/version.h>
 
 namespace miracle
 {
@@ -47,7 +48,9 @@ class ForwardingSurface : public mir::scene::Surface
     void register_interest(const std::weak_ptr<mir::scene::SurfaceObserver>& observer, mir::Executor& executor) override;
     void register_early_observer(const std::weak_ptr<mir::scene::SurfaceObserver>& observer, mir::Executor& executor) override;
     void unregister_interest(const mir::scene::SurfaceObserver& observer) override;
+#if (MIR_SERVER_MAJOR_VERSION > 2) || (MIR_SERVER_MAJOR_VERSION == 2 && MIR_SERVER_MINOR_VERSION >= 19)
     void initial_placement_done() override;
+#endif
     std::string name() const override;
     mir::geometry::Size content_size() const override;
     mir::geometry::Rectangle input_bounds() const override;

tests/mock_surface.h

@@ -19,6 +19,7 @@
 
 #include <gmock/gmock.h>
 #include <mir/scene/surface.h>
+#include <mir/version.h>
 
 namespace miracle
 {
@@ -27,7 +28,9 @@ namespace test
     class MockSurface : public mir::scene::Surface
     {
     public:
+#if (MIR_SERVER_MAJOR_VERSION > 2) || (MIR_SERVER_MAJOR_VERSION == 2 && MIR_SERVER_MINOR_VERSION >= 19)
         MOCK_METHOD(void, initial_placement_done, (), (override));
+#endif
         MOCK_METHOD(mir::geometry::Displacement, content_offset, (), (const, override));
         MOCK_METHOD(std::shared_ptr<mir::frontend::BufferStream>, primary_buffer_stream, (), (const, override));
         MOCK_METHOD((mir::wayland::Weak<mir::frontend::WlSurface> const&), wayland_surface, (), (override));

tests/stub_surface.h

@@ -25,7 +25,7 @@ namespace miracle::test
 class StubSurface : public mir::scene::Surface
 {
 public:
-#if MIR_SERVER_MAJOR_VERSION >= 2 && MIR_SERVER_MINOR_VERSION >= 19
+#if (MIR_SERVER_MAJOR_VERSION > 2) || (MIR_SERVER_MAJOR_VERSION == 2 && MIR_SERVER_MINOR_VERSION >= 19)
     void initial_placement_done() override { }
 #endif