Mir

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

Proposed by Alan Griffiths on 2016-10-11
Status: Merged
Approved by: Brandon Schaefer on 2016-10-11
Approved revision: 3756
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 on 2016-10-11
Mir CI Bot continuous-integration Approve on 2016-10-11
Alexandros Frantzis (community) 2016-10-11 Approve on 2016-10-11
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.
Alexandros Frantzis (afrantzis) wrote :

Looks good.

review: Approve
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)
Brandon Schaefer (brandontschaefer) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/client/mir_surface_api.cpp'
2--- src/client/mir_surface_api.cpp 2016-10-11 07:12:33 +0000
3+++ src/client/mir_surface_api.cpp 2016-10-11 14:09:42 +0000
4@@ -82,13 +82,7 @@
5 MirSurface* parent,
6 MirRectangle* rect)
7 {
8- mir::require(mir_surface_is_valid(parent));
9- mir::require(rect != nullptr);
10-
11- auto spec = new MirSurfaceSpec{connection, width, height, format};
12- spec->type = mir_surface_type_tip;
13- spec->parent = parent;
14- return spec;
15+ return mir_connection_create_spec_for_tip(connection, width, height, format, parent, rect, mir_edge_attachment_any);
16 }
17
18 MirSurfaceSpec* mir_connection_create_spec_for_tip(MirConnection* connection,

Subscribers

People subscribed via source and target branches