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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:indicator-datetime/15.10 at revision 429

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

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

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

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

444. By Charles Kerr on 2015-10-14

re-enable sound tests in test-snap

443. 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

442. By Charles Kerr on 2015-10-14

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

441. By Charles Kerr on 2015-10-13

honor gsettings for calendar events

440. By Charles Kerr on 2015-10-13

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

439. By Charles Kerr on 2015-10-13

disable broken test

438. By Charles Kerr on 2015-10-13

use @FOO@ intead of for variable substitution when configuring files

437. By Charles Kerr on 2015-10-13

fix copy-paste typo in tests/test-snap.cpp

436. By Charles Kerr on 2015-10-13

add --fixes

435. By Charles Kerr on 2015-10-13

sync with trunk