Mir

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

Proposed by Daniel van Vugt on 2017-05-01
Status: Merged
Approved by: Daniel van Vugt on 2017-05-03
Approved revision: 4159
Merged at revision: 4161
Proposed branch: lp:~vanvugt/mir/fix-mir_window_get_buffer_stream-deprecation
Merge into: lp:mir
Diff against target: 12 lines (+1/-1)
1 file modified
include/client/mir_toolkit/mir_window.h (+1/-1)
To merge this branch: bzr merge lp:~vanvugt/mir/fix-mir_window_get_buffer_stream-deprecation
Reviewer Review Type Date Requested Status
Andreas Pokorny (community) Approve on 2017-05-02
Mir CI Bot continuous-integration Approve on 2017-05-01
Mir development team 2017-05-01 Pending
Review via email: mp+323455@code.launchpad.net

Commit message

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

To post a comment you must log in.
Mir CI Bot (mir-ci-bot) wrote :

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) wrote :

sure

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/client/mir_toolkit/mir_window.h'
2--- include/client/mir_toolkit/mir_window.h 2017-04-13 07:00:27 +0000
3+++ include/client/mir_toolkit/mir_window.h 2017-05-01 09:53:21 +0000
4@@ -710,7 +710,7 @@
5 * \param[in] window The window
6 */
7 MirBufferStream* mir_window_get_buffer_stream(MirWindow* window)
8- __attribute__((deprecated("Use mir_window_spec_set_cursor_name/mir_window_spec_set_cursor_render_surface instead")));
9+ __attribute__((deprecated("Use mir_window_spec_add_render_surface during window creation/modification instead")));
10 /**
11 * Retrieve a text description of the error. The returned string is owned by
12 * the library and remains valid until the window or the associated

Subscribers

People subscribed via source and target branches