Merge lp://staging/~dobey/ubuntu-app-launch/add-desktop-apis into lp://staging/ubuntu-app-launch/16.10

Proposed by dobey
Status: Merged
Merged at revision: 244
Proposed branch: lp://staging/~dobey/ubuntu-app-launch/add-desktop-apis
Merge into: lp://staging/ubuntu-app-launch/16.10
Diff against target: 168 lines (+90/-0)
4 files modified
libubuntu-app-launch/application-info-desktop.cpp (+37/-0)
libubuntu-app-launch/application-info-desktop.h (+15/-0)
libubuntu-app-launch/application.h (+14/-0)
tests/application-info-desktop.cpp (+24/-0)
To merge this branch: bzr merge lp://staging/~dobey/ubuntu-app-launch/add-desktop-apis
Reviewer Review Type Date Requested Status
Ted Gould (community) Needs Fixing
unity-api-1-bot continuous-integration Needs Fixing
Review via email: mp+302467@code.staging.launchpad.net

Commit message

Add missing APIs for necessary info from .desktop files.

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:238
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/46/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/327/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/333
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/260
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/260
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/260
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/190/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/190
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/190/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/190
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/190/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/190/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/190/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/190
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/190/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/190
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/190/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/190
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/190/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/190
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/190/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/46/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ted Gould (ted) wrote :

Needs to support code formatting for C++ code in this project. That can be easily done by typing "make format". Otherwise looks good!

review: Needs Fixing
Revision history for this message
dobey (dobey) wrote :

No, I can't use "make format" nor "make format-tests" because they are broken, do not follow the coding style which we really should be following anyway (nor does the rest of UAL follow that standard), and the changes in this MP are fully consistent with the rest of the file in which they changed.

I have filed several bugs about the style issues in UAL this morning. I'll agree they should be fixed, but this isn't the branch to do it in.

Revision history for this message
Ted Gould (ted) wrote :

All I care is that "make format && bzr diff" returns no changes.

review: Needs Fixing

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