Merge lp://staging/~dobey/ubuntu-app-launch/snap-icon-unbreak into lp://staging/ubuntu-app-launch

Proposed by dobey
Status: Merged
Approved by: Ted Gould
Approved revision: 271
Merged at revision: 272
Proposed branch: lp://staging/~dobey/ubuntu-app-launch/snap-icon-unbreak
Merge into: lp://staging/ubuntu-app-launch
Diff against target: 176 lines (+87/-6)
5 files modified
libubuntu-app-launch/application-icon-finder.cpp (+12/-0)
libubuntu-app-launch/application-impl-snap.cpp (+30/-0)
tests/applications/foo.desktop (+1/-1)
tests/applications/single.desktop (+1/-1)
tests/libual-cpp-test.cc (+43/-4)
To merge this branch: bzr merge lp://staging/~dobey/ubuntu-app-launch/snap-icon-unbreak
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
unity-api-1-bot continuous-integration Approve
Review via email: mp+314461@code.staging.launchpad.net

Commit message

Handle more common Icon entries in .desktop files for snaps.

To post a comment you must log in.
271. By dobey

Link the bug.

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:271
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/156/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1335
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1342
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1120
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1120/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1120
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1120/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1120
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1120/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1120
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1120/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1120
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1120/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1120
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1120/artifact/output/*zip*/output.zip

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

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

Cool, thanks for adding the tests and the additional cases. Don't love that we had to put meta/gui into the application-icon-finder code, but I don't see another clean way to do that.

Hopefully no one will try to put an icon in /usr/share/meta/gui ;-)

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