qtubuntu

Merge lp:~albaguirre/qtubuntu/mir-0.26.1-compat into lp:qtubuntu

  1. mir-0.26.1-compat
  2. Merge into trunk
Proposed by Alberto Aguirre
Status: Merged
Approved by: Lukáš Tinkl
Approved revision: 380
Merged at revision: 370
Proposed branch: lp:~albaguirre/qtubuntu/mir-0.26.1-compat
Merge into: lp:qtubuntu
Prerequisite: lp:~aacid/qtubuntu/fix_crash_starting_konsole
Diff against target: 16 lines (+3/-3)
1 file modified
src/ubuntumirclient/qmirclientwindow.cpp (+3/-3)
To merge this branch: bzr merge lp:~albaguirre/qtubuntu/mir-0.26.1-compat
Reviewer Review Type Date Requested Status
Lukáš Tinkl (community) Approve
Unity8 CI Bot continuous-integration Approve
Review via email: mp+317257@code.launchpad.net

Commit message

Changes for mir 0.26.1: PersitentID has been renamed to WindowID

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:380
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/181/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4109
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4137
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3977
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3977/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3977
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3977/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3977
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3977/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3977
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3977/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3977
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3977/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3977
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3977/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/181/rebuild

review: Approve (continuous-integration)
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

Yup, thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/ubuntumirclient/qmirclientwindow.cpp'
2--- src/ubuntumirclient/qmirclientwindow.cpp 2017-02-14 19:34:13 +0000
3+++ src/ubuntumirclient/qmirclientwindow.cpp 2017-02-14 19:34:14 +0000
4@@ -712,9 +712,9 @@
5 QString UbuntuSurface::persistentSurfaceId()
6 {
7 if (mPersistentIdStr.isEmpty()) {
8- MirPersistentId* mirPermaId = mir_window_request_persistent_id_sync(mMirWindow);
9- mPersistentIdStr = mir_persistent_id_as_string(mirPermaId);
10- mir_persistent_id_release(mirPermaId);
11+ auto id = mir_window_request_window_id_sync(mMirWindow);
12+ mPersistentIdStr = mir_window_id_as_string(id);
13+ mir_window_id_release(id);
14 }
15 return mPersistentIdStr;
16 }

Subscribers

People subscribed via source and target branches