Merge lp:~3v1n0/bamf/no-display-desktop-files-lower-priority into lp:bamf/0.4
Proposed by
Marco Trevisan (Treviño)
Status: | Merged |
---|---|
Approved by: | Marco Trevisan (Treviño) |
Approved revision: | 538 |
Merged at revision: | 527 |
Proposed branch: | lp:~3v1n0/bamf/no-display-desktop-files-lower-priority |
Merge into: | lp:bamf/0.4 |
Prerequisite: | lp:~3v1n0/bamf/class-to-index-file |
Diff against target: |
320 lines (+145/-7) 7 files modified
src/bamf-matcher-private.h (+1/-0) src/bamf-matcher.c (+68/-7) tests/bamfdaemon/data/no-display/test-bamf-app.desktop (+8/-0) tests/bamfdaemon/data/test-bamf-app-display.desktop (+7/-0) tests/bamfdaemon/data/test-bamf-app-no-display.desktop (+8/-0) tests/bamfdaemon/test-bamf.c (+1/-0) tests/bamfdaemon/test-matcher.c (+52/-0) |
To merge this branch: | bzr merge lp:~3v1n0/bamf/no-display-desktop-files-lower-priority |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Brandon Schaefer (community) | Approve | ||
Review via email:
|
Commit message
BamfMatcher: make sure that all the no-display desktop files have lower priority
Description of the change
When a .desktop file with NoDisplay=true is passed to BAMF, we make sure that we add it always at the end of our lists so that it won't be used for matching unless it's the only one we have or it has a StartupWMClass value that forces it.
Tests updated.
To post a comment you must log in.
FAILED: Continuous integration, rev:534 jenkins. qa.ubuntu. com/job/ bamf-ci/ 2/ jenkins. qa.ubuntu. com/job/ bamf-raring- amd64-ci/ 2/console jenkins. qa.ubuntu. com/job/ bamf-raring- armhf-ci/ 2/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ bamf-ci/ 2/rebuild
http://