← Back to branch summary

~dbarth/indicator-datetime/mute-notifications-15.04

~dbarth/indicator-datetime/mute-notifications-15.04

« back to all changes in this revision

Viewing changes to include/datetime/settings-live.h

Committer: CI Train Bot
Author(s): Charles Kerr
Date: 2015-10-14 02:43:17 UTC
mfrom: (421.1.9 15.04-lp-1505688-different-default-sounds-for-alarms-and-events)
Revision ID: ci-train-bot@canonical.com-20151014024317-gs1rjmgvk7te6bta

Use a different default sound for alarms and calendar events.
Fixes: #1505688
Approved by: Rodney Dawes

files renamed:
data/com.canonical.indicator.datetime.gschema.xml.in => data/com.canonical.indicator.datetime.gschema.xml.in.in

tests/test-eds-ics-all-day-events.ics => tests/test-eds-ics-all-day-events.ics.in

tests/test-eds-ics-missing-trigger.ics => tests/test-eds-ics-missing-trigger.ics.in

tests/test-eds-ics-nonrepeating-events.ics => tests/test-eds-ics-nonrepeating-events.ics.in

tests/test-eds-ics-repeating-events.ics => tests/test-eds-ics-repeating-events.ics.in

tests/test-eds-ics-repeating-valarms.ics => tests/test-eds-ics-repeating-valarms.ics.in

tests/test-eds-ics-tzids-2.ics => tests/test-eds-ics-tzids-2.ics.in

tests/test-eds-ics-tzids.ics => tests/test-eds-ics-tzids.ics.in

files modified:
CMakeLists.txt

data/CMakeLists.txt

debian/control

include/datetime/settings-live.h

include/datetime/settings-shared.h

include/datetime/settings.h

include/datetime/snap.h

include/notifications/sound.h

src/main.cpp

src/settings-live.cpp

src/snap.cpp

tests/CMakeLists.txt

tests/manual-test-snap.cpp

tests/test-eds-ics-missing-trigger.cpp

tests/test-eds-ics-nonrepeating-events.cpp

tests/test-eds-ics-repeating-events.cpp

tests/test-settings.cpp

tests/test-snap.cpp

Show diffs side-by-side

added added

removed removed

include/datetime/settings-live.h

55

55

void update_show_year();

56

56

void update_time_format_mode();

57

57

void update_timezone_name();

58

void update_calendar_sound();

58

59

void update_alarm_sound();

59

60

void update_alarm_volume();

60

61

void update_alarm_duration();

Older »