indicator-power

Merge lp://staging/~charlesk/indicator-power/use-libnotify-for-audio into lp://staging/indicator-power

  1. use-libnotify-for-audio
  2. Merge into trunk.16.10
Proposed by Charles Kerr
Status: Merged
Approved by: Ted Gould
Approved revision: 300
Merged at revision: 294
Proposed branch: lp://staging/~charlesk/indicator-power/use-libnotify-for-audio
Merge into: lp://staging/indicator-power
Diff against target: 1409 lines (+239/-728)
16 files modified
CMakeLists.txt (+11/-5)
debian/control (+0/-1)
src/CMakeLists.txt (+1/-8)
src/main.c (+1/-5)
src/notifier.c (+18/-76)
src/notifier.h (+1/-5)
src/sound-player-gst.c (+0/-173)
src/sound-player-gst.h (+0/-70)
src/sound-player.c (+0/-45)
src/sound-player.h (+0/-72)
tests/CMakeLists.txt (+2/-9)
tests/glib-fixture.h (+145/-58)
tests/sound-player-mock.c (+0/-94)
tests/sound-player-mock.h (+0/-75)
tests/test-device.cc (+2/-2)
tests/test-notify.cc (+58/-30)
To merge this branch: bzr merge lp://staging/~charlesk/indicator-power/use-libnotify-for-audio
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+294834@code.staging.launchpad.net

Commit message

Use the fdo 'sound-file' hint to play a sound when a low battery notification is shown.

Description of the change

Use the fdo 'sound-file' hint to play a sound when a low battery notification is shown. Previously the code was doing a lot of unnecessary work by playing it directly via gst.

Minor secondary work: fixing cmake warnings, syncing glib test fixture with indicator-datetime

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:300
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/161/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-power-wily-amd64-ci/10/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-wily-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/indicator-power-wily-armhf-ci/11/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-power-ci/161/rebuild

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

Love deleting code! Probably should check on the copyright issue, kinda silly, but might effect from where you sync'd from as well.

review: Approve
lp://staging/~charlesk/indicator-power/use-libnotify-for-audio updated
301. By Charles Kerr

fix glib-fixture.h copyright year in header comment

Revision history for this message
Charles Kerr (charlesk) wrote :

Whoops, yep looks like the version in indicator-datetime didn't get updated. Fixed r301.

This kind of error wouldn't happen if I stored this header in some common area. :P

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