Merge lp:~alan-griffiths/mir/fix-0.26-mirclient-ABI into lp:~mir-team/mir/0.26-old

[Alan Griffiths]

Restore symbols dropped between 0.26.0 and 0.26.1

Restore symbols dropped between 0.26.0 and 0.26.1

Check with:

$ tools/abigail_check.sh mirclient <bilddir>/abi_dumps/ . <bilddir>

[Daniel van Vugt (vanvugt)]

Yes. If we can still modify the target branch.

review: Approve

=== modified file 'src/client/mir_render_surface_api.cpp'
--- src/client/mir_render_surface_api.cpp	2017-02-02 19:38:06 +0000
+++ src/client/mir_render_surface_api.cpp	2017-02-06 09:44:20 +0000
@@ -225,6 +225,7 @@
     rs->set_size({width, height});
 }
 
+extern "C" __attribute__((alias("mir_window_spec_set_cursor_render_surface"))) void mir_surface_spec_set_cursor_render_surface();
 void mir_window_spec_set_cursor_render_surface(
     MirWindowSpec* spec,
     MirRenderSurface* surface,

=== modified file 'src/client/mir_surface_api.cpp'
--- src/client/mir_surface_api.cpp	2017-02-03 21:07:53 +0000
+++ src/client/mir_surface_api.cpp	2017-02-06 09:44:20 +0000
@@ -418,6 +418,7 @@
     MIR_LOG_UNCAUGHT_EXCEPTION(ex);
 }
 
+extern "C" __attribute__((alias("mir_window_spec_set_cursor_name"))) void mir_surface_spec_set_cursor_name();
 void mir_window_spec_set_cursor_name(MirWindowSpec* spec, char const* name)
 try
 {

=== modified file 'src/client/symbols.map'
--- src/client/symbols.map	2017-02-02 19:52:04 +0000
+++ src/client/symbols.map	2017-02-06 09:44:20 +0000
@@ -482,6 +482,8 @@
     mir_pointer_config_set_handedness;
     mir_pointer_config_set_horizontal_scroll_scale;
     mir_pointer_config_set_vertical_scroll_scale;
+    mir_surface_spec_set_cursor_name;
+    mir_surface_spec_set_cursor_render_surface;
     mir_touchpad_config_get_button_down_scroll_button;
     mir_touchpad_config_get_click_modes;
     mir_touchpad_config_get_disable_while_typing;