Merge lp://qastaging/~renatofilho/indicator-datetime/fix-1533681 into lp://qastaging/indicator-datetime/15.10
Proposed by
Renato Araujo Oliveira Filho
| Status: | Merged |
|---|---|
| Approved by: | Charles Kerr |
| Approved revision: | 454 |
| Merged at revision: | 447 |
| Proposed branch: | lp://qastaging/~renatofilho/indicator-datetime/fix-1533681 |
| Merge into: | lp://qastaging/indicator-datetime/15.10 |
| Prerequisite: | lp://qastaging/~renatofilho/indicator-datetime/fix-1508438 |
| Diff against target: |
217 lines (+49/-26) 7 files modified
include/datetime/appointment.h (+2/-0) src/appointment.cpp (+11/-1) src/engine-eds.cpp (+12/-4) src/snap.cpp (+3/-1) tests/notification-fixture.h (+10/-10) tests/test-eds-ics-repeating-valarms.cpp (+8/-8) tests/test-sound.cpp (+3/-2) |
| To merge this branch: | bzr merge lp://qastaging/~renatofilho/indicator-datetime/fix-1533681 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Charles Kerr (community) | Approve | ||
| Arthur Mello (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Only play a sound alert if the event contains a SOUND reminder.
Description of the change
How to Test:
1 - Create an alarm on google wit a pop-up notification at event time
2 - Create an alarm on google with e-mail notification at event time
3 - Create an alarm on google without any notification at event time
5 - Create a event with a reminder at event time on your device
4 - Sync your device with google
5 - Make sure that the event with pop-up notification does not play any sound but shows a pop up when it starts
6 - Make sure that the event with e-mail notification does not show any notification and does not play any sound
7 - Make sure the event created on device shows a notification and play a sound when it starts.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Basically the right idea, but implementation is much more complicated than necessary. See comments inline