Merge lp:~vanvugt/mir/fix-mir_window_get_buffer_stream-deprecation into lp:mir

[Daniel van Vugt]

Fix wrong deprecation message that was copy/pasted in for
mir_window_get_buffer_stream.

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:4159
https://mir-jenkins.ubuntu.com/job/mir-ci/3385/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4583
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4711
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4700
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4700
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4615
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4615/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4615
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4615/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4615
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4615/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4615
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4615/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4615
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4615/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3385/rebuild

review: Approve (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

sure

review: Approve

=== modified file 'include/client/mir_toolkit/mir_window.h'
--- include/client/mir_toolkit/mir_window.h	2017-04-13 07:00:27 +0000
+++ include/client/mir_toolkit/mir_window.h	2017-05-01 09:53:21 +0000
@@ -710,7 +710,7 @@
  *   \param[in] window The window
  */
 MirBufferStream* mir_window_get_buffer_stream(MirWindow* window)
-    __attribute__((deprecated("Use mir_window_spec_set_cursor_name/mir_window_spec_set_cursor_render_surface instead")));
+    __attribute__((deprecated("Use mir_window_spec_add_render_surface during window creation/modification instead")));
 /**
  * Retrieve a text description of the error. The returned string is owned by
  * the library and remains valid until the window or the associated