Unity System Compositor

Merge lp://staging/~afrantzis/unity-system-compositor/dbus-active-outputs into lp://staging/unity-system-compositor

  1. dbus-active-outputs
  2. Merge into trunk
Proposed by Alexandros Frantzis
Status: Merged
Approved by: Alexandros Frantzis
Approved revision: 307
Merged at revision: 307
Proposed branch: lp://staging/~afrantzis/unity-system-compositor/dbus-active-outputs
Merge into: lp://staging/unity-system-compositor
Diff against target: 1233 lines (+794/-86)
13 files modified
src/com.canonical.Unity.Display.xml (+31/-1)
src/mir_screen.cpp (+153/-19)
src/mir_screen.h (+32/-6)
src/screen.h (+23/-2)
src/server.cpp (+6/-1)
src/unity_display_service.cpp (+179/-12)
src/unity_display_service.h (+9/-2)
tests/include/usc/test/mock_screen.h (+3/-2)
tests/include/usc/test/stub_display_configuration.h (+55/-7)
tests/integration-tests/test_unity_display_service.cpp (+148/-9)
tests/integration-tests/unity_display_dbus_client.cpp (+47/-2)
tests/integration-tests/unity_display_dbus_client.h (+6/-2)
tests/unit-tests/test_mir_screen.cpp (+102/-21)
To merge this branch: bzr merge lp://staging/~afrantzis/unity-system-compositor/dbus-active-outputs
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve
Unity System Compositor Development Team Pending
Review via email: mp+316443@code.staging.launchpad.net

Commit message

Update the Unity.Display DBus interface to support multiple outputs better

Description of the change

Update the Unity.Display DBus interface to support multiple outputs better

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

FAILED: Continuous integration, rev:307
https://mir-jenkins.ubuntu.com/job/usc-ci/49/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-usc/70/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3983
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3973
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3973
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3973
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/74/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/74/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/74/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/74/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/74/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:307
https://mir-jenkins.ubuntu.com/job/usc-ci/53/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-usc/75
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3988
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3978
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3978
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3978
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/79
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/79/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/79
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/79/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/79
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/79/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/79
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/79/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/79
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/79/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches