Mir

Merge lp:~alan-griffiths/mir/fix-1632335 into lp:mir

Proposed by Alan Griffiths
Status: Merged
Approved by: Brandon Schaefer
Approved revision: no longer in the source branch.
Merged at revision: 3755
Proposed branch: lp:~alan-griffiths/mir/fix-1632335
Merge into: lp:mir
Diff against target: 18 lines (+1/-7)
1 file modified
src/client/mir_surface_api.cpp (+1/-7)
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-1632335
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
Mir CI Bot continuous-integration Approve
Alexandros Frantzis (community) Approve
Review via email: mp+308126@code.launchpad.net

Commit message

The deprecated function mir_connection_create_spec_for_tooltip() failed to set the aux_rect. Reimplemented as a wrapper for mir_connection_create_spec_for_tip()

To post a comment you must log in.
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Looks good.

review: Approve
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:3756
https://mir-jenkins.ubuntu.com/job/mir-ci/1940/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/2470
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2533
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2525
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2525
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2525
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2499
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2499/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/2499
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2499/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2499
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2499/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2499
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2499/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2499
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2499/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/2499
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2499/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/client/mir_surface_api.cpp'
--- src/client/mir_surface_api.cpp 2016-10-11 07:12:33 +0000
+++ src/client/mir_surface_api.cpp 2016-10-11 14:09:42 +0000
@@ -82,13 +82,7 @@
82 MirSurface* parent,82 MirSurface* parent,
83 MirRectangle* rect)83 MirRectangle* rect)
84{84{
85 mir::require(mir_surface_is_valid(parent));85 return mir_connection_create_spec_for_tip(connection, width, height, format, parent, rect, mir_edge_attachment_any);
86 mir::require(rect != nullptr);
87
88 auto spec = new MirSurfaceSpec{connection, width, height, format};
89 spec->type = mir_surface_type_tip;
90 spec->parent = parent;
91 return spec;
92}86}
9387
94MirSurfaceSpec* mir_connection_create_spec_for_tip(MirConnection* connection,88MirSurfaceSpec* mir_connection_create_spec_for_tip(MirConnection* connection,

Subscribers

People subscribed via source and target branches