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
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Cris Dywan Approve
Review via email: mp+235911@code.qastaging.launchpad.net

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-disabled' tag for the disabled alarms. Attachments do not need to be removed anymore from the alarm.

To post a comment you must log in.
Revision history for this message
Cris Dywan (kalikiana) wrote :

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.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches