lp:~charlesk/indicator-datetime/15.04-lp-1505688-different-default-sounds-for-alarms-and-events

Branch merges

Merged into lp:indicator-datetime/15.04 at revision 422

Antti Kaijanmäki (community): Approve on 2015-10-14

PS Jenkins bot (community): Approve (continuous-integration) on 2015-10-14

dobey (community): Approve on 2015-10-13

Diff: 654 lines (+206/-40)

22 files modified

CMakeLists.txt (+6/-0)
data/CMakeLists.txt (+5/-3)
data/com.canonical.indicator.datetime.gschema.xml.in.in (+8/-1)
debian/control (+2/-0)
include/datetime/settings-live.h (+1/-0)
include/datetime/settings-shared.h (+1/-0)
include/datetime/settings.h (+1/-0)
include/datetime/snap.h (+2/-0)
include/notifications/sound.h (+22/-0)
src/main.cpp (+2/-1)
src/settings-live.cpp (+14/-0)
src/snap.cpp (+15/-9)
tests/CMakeLists.txt (+3/-1)
tests/manual-test-snap.cpp (+2/-1)
tests/test-eds-ics-missing-trigger.cpp (+1/-1)
tests/test-eds-ics-missing-trigger.ics.in (+2/-2)
tests/test-eds-ics-nonrepeating-events.cpp (+1/-1)
tests/test-eds-ics-nonrepeating-events.ics.in (+1/-1)
tests/test-eds-ics-repeating-events.cpp (+8/-8)
tests/test-eds-ics-repeating-events.ics.in (+1/-1)
tests/test-settings.cpp (+1/-0)
tests/test-snap.cpp (+107/-10)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1505688: Alerts like for calendar events should use a default sound different from alarms

Critical

Fix Released

Link a bug report

Related blueprints

430. By Charles Kerr on 2015-10-14

re-enable sound tests in test-snap

429. By Charles Kerr on 2015-10-14

in test-snap, wait a moment after creating the Snap to allow its async dbus internals to finish bootstrapping

428. By Charles Kerr on 2015-10-14

add ubuntu-touch-sounds to Build-Depends for unit tests on phone notification sounds

427. By Charles Kerr on 2015-10-13

honor gsettings for calendar events

426. By Charles Kerr on 2015-10-13

rather than commenting out a test, use Google Test's DISABLED_ feature to disable it

425. By Charles Kerr on 2015-10-13

comment out the disabled test's scaffolding

424. By Charles Kerr on 2015-10-13

disable broken test

423. By Charles Kerr on 2015-10-13

sync with fixes to sibling 15.10 branch

422. By Charles Kerr on 2015-10-13

manual 15.04 rebase of lp:~charlesk/indicator-datetime/15.10-lp-1505688-different-default-sounds-for-alarms-and-events

421. By CI Train Bot Account on 2015-10-07

Releasing 15.04.0+15.04.20151007.1-0ubuntu1