Merge lp://staging/~larryprice/ubuntu-app-launch/recursive-libertine-app-dirs into lp://staging/ubuntu-app-launch/16.10

Proposed by Larry Price
Status: Merged
Approved by: Ted Gould
Approved revision: 339
Merged at revision: 254
Proposed branch: lp://staging/~larryprice/ubuntu-app-launch/recursive-libertine-app-dirs
Merge into: lp://staging/ubuntu-app-launch/16.10
Prerequisite: lp://staging/~ted/ubuntu-app-launch/snappy-backend
Diff against target: 262 lines (+85/-50)
6 files modified
libubuntu-app-launch/application-impl-libertine.cpp (+61/-38)
libubuntu-app-launch/application-impl-libertine.h (+2/-0)
tests/libertine-data/libertine-container/container-name/rootfs/usr/share/applications/nested/test-nested.desktop (+5/-0)
tests/libual-cpp-test.cc (+9/-4)
tests/libual-test.cc (+5/-5)
tests/list-apps.cpp (+3/-3)
To merge this branch: bzr merge lp://staging/~larryprice/ubuntu-app-launch/recursive-libertine-app-dirs
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
unity-api-1-bot continuous-integration Approve
Review via email: mp+302669@code.staging.launchpad.net

Commit message

Recursively sweep for desktop files for libertine applications.

Description of the change

Recursively sweep for desktop files for libertine applications.

Goes hand-in-hand with an update to liblibertine which finds desktop files recursively coming in the next release. This pattern seems to be especially prevalent in vivid, though there are a number of apps that do this in more modern releases as well.

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

The g_dir_close() is the only big thing, the others are minor cleanups.

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

Thanks for the fixes!

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

Needs to keep the #ifdef for snappy (comment on line below)

review: Needs Fixing
339. By Larry Price

re-add snappy check lost in merge

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:339
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/90/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/519
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/525
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/430
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/430
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/430
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/360
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/360/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/360
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/360/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/360
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/360/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/360
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/360/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/360
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/360/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/360
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/360/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/360
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/360/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/360
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/360/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/360
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/360/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Ted Gould (ted) :
review: Approve

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