Merge lp://staging/~3v1n0/libappindicator/incons-paths-on-snap into lp://staging/libappindicator/16.10

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Andrea Azzarone
Approved revision: 288
Merged at revision: 277
Proposed branch: lp://staging/~3v1n0/libappindicator/incons-paths-on-snap
Merge into: lp://staging/libappindicator/16.10
Diff against target: 353 lines (+124/-14)
5 files modified
configure.ac (+1/-1)
debian/control (+1/-0)
debian/rules (+0/-2)
example/simple-client-vala.vala (+1/-1)
src/app-indicator.c (+121/-10)
To merge this branch: bzr merge lp://staging/~3v1n0/libappindicator/incons-paths-on-snap
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Approve
unity-api-1-bot continuous-integration Needs Fixing
Review via email: mp+311424@code.staging.launchpad.net

Commit message

AppIndicator: fix icon and theme paths when running in $SNAP environment

Prepend $SNAP path to icons and theme paths when running in a sandboxed
environment, this allows to run app indicators without caring about the fact
they've been designed or compiled to run in a snap world or not.

Description of the change

See gtk2/gtk3 examples using this at https://github.com/3v1n0/indicators-examples-snaps

To post a comment you must log in.
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 :
review: Needs Fixing (continuous-integration)
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 :
review: Needs Fixing (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Azzarone (azzar1) wrote :

LGTM.

review: Approve
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Actually I've noticed that this is not correct when the developer uses an hardcoded path suc has /snap/$SNAP_NAME/current.

So it needs some tuning.

288. By Marco Trevisan (Treviño)

app-indicator: get real path on snap when trying to transform it

So when pointing to /snap/<name>/current will be automatically translated
to /snap/<name>/<current_revision>/...

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Done this part too...

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 :

FAILED: Continuous integration, rev:288
https://jenkins.canonical.com/unity-api-1/job/lp-libappindicator-ci/7/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1208/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1215
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1000
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1000/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1000
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1000/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1000/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1000/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1000/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1000
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1000/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-libappindicator-ci/7/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Azzarone (azzar1) wrote :

+1

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