Merge lp:~3v1n0/bamf/javaws-ignore-desktop into lp:bamf/0.4
Status: | Merged |
---|---|
Approved by: | Marco Trevisan (Treviño) on 2013-01-29 |
Approved revision: | 542 |
Merged at revision: | 518 |
Proposed branch: | lp:~3v1n0/bamf/javaws-ignore-desktop |
Merge into: | lp:bamf/0.4 |
Diff against target: |
558 lines (+252/-70) 9 files modified
src/bamf-legacy-window-test.c (+21/-0) src/bamf-legacy-window-test.h (+1/-0) src/bamf-legacy-window.c (+47/-0) src/bamf-legacy-window.h (+4/-0) src/bamf-matcher-private.h (+1/-0) src/bamf-matcher.c (+49/-55) tests/bamfdaemon/data/icedtea-netx-javaws.desktop (+12/-0) tests/bamfdaemon/test-matcher.c (+107/-3) tests/run-xvfb.sh (+10/-12) |
To merge this branch: | bzr merge lp:~3v1n0/bamf/javaws-ignore-desktop |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing on 2013-01-29 | |
Brandon Schaefer (community) | 2013-01-29 | Approve on 2013-01-29 | |
Review via email:
|
Commit message
BamfMatcher: ignore the javaws windows when setting the window hint
Description of the change
We need to avoid that a Java Web Application is associated with the default "Java Web Start" .desktop file provided by java as the default opener for jnlp files, or the bug #1098186 will show again.
Test added.
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:532
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:533
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:535
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:536
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:539
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:540
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
Brandon Schaefer (brandontschaefer) wrote : | # |
Confirmed fixes the problem :), (Even fixes it for oracale-java7)
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:541
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
FAILURE: http://
- 542. By Marco Trevisan (Treviño) on 2013-01-29
-
BamfMatcher: don't abort if we can't monitor a directory, just log it
FAILED: Continuous integration, rev:531 jenkins. qa.ubuntu. com/job/ bamf-mbs- ci/32/ jenkins. qa.ubuntu. com/job/ bamf-mbs- ci/./build= pbuilder, distribution= quantal, flavor= amd64/32/ console jenkins. qa.ubuntu. com/job/ bamf-mbs- ci/./build= pbuilder, distribution= quantal, flavor= i386/32/ console
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
Click here to trigger a rebuild: jenkins. qa.ubuntu. com/job/ bamf-mbs- ci/32// rebuild/?
http://