Merge lp://qastaging/~zsombi/ubuntu-ui-toolkit/add_alarm_tags into lp://qastaging/ubuntu-ui-toolkit/staging
Proposed by
Zsombor Egri
Status: | Merged |
---|---|
Approved by: | Cris Dywan |
Approved revision: | 1266 |
Merged at revision: | 1266 |
Proposed branch: | lp://qastaging/~zsombi/ubuntu-ui-toolkit/add_alarm_tags |
Merge into: | lp://qastaging/ubuntu-ui-toolkit/staging |
Diff against target: |
153 lines (+73/-21) 2 files modified
modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp (+50/-21) tests/unit/tst_alarms/tst_alarms.cpp (+23/-0) |
To merge this branch: | bzr merge lp://qastaging/~zsombi/ubuntu-ui-toolkit/add_alarm_tags |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Cris Dywan | Approve | ||
Review via email:
|
Commit message
Use tags as workaround for an alarm and an additional one for a disabled alarm as agreed in the attached bug #1361702. The alarm should always save the visual and audible reminder attachments no matter if disabled or not.
Description of the change
The workaround was agreed as described in bug #1361702, Calendar application will omit all calendar events which are tagged with 'x-canonical-alarm' tag, and datetime indicator and UITK Alarm services will set the 'x-canonical-
To post a comment you must log in.
I'm grinding my teeth down to the flesh and pulling my hair out in bulges reviewing this work-around… as we're in development cycle we can still do this despite the change in semantics. Let's have it.