lp://qastaging/~charlesk/indicator-datetime/15.04-lp-1505688-different-default-sounds-for-alarms-and-events
Created by
Charles Kerr
and last modified
- Get this branch:
- bzr branch lp://qastaging/~charlesk/indicator-datetime/15.04-lp-1505688-different-default-sounds-for-alarms-and-events
Only
Charles Kerr
can upload to this branch. If you are
Charles Kerr
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Antti Kaijanmäki (community): Approve
- PS Jenkins bot (community): Approve (continuous-integration)
- dobey (community): Approve
-
Diff: 654 lines (+206/-40)22 files modifiedCMakeLists.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)
Related bugs
Related blueprints
Branch information
Recent revisions
- 429. By Charles Kerr
-
in test-snap, wait a moment after creating the Snap to allow its async dbus internals to finish bootstrapping
- 428. By Charles Kerr
-
add ubuntu-touch-sounds to Build-Depends for unit tests on phone notification sounds
- 426. By Charles Kerr
-
rather than commenting out a test, use Google Test's DISABLED_ feature to disable it
- 422. By Charles Kerr
-
manual 15.04 rebase of lp:~charlesk/indicator-datetime/15.10-lp-1505688-different-default-sounds-for-alarms-and-events
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://qastaging/indicator-datetime/15.10