Indicator Date and Time

Merge lp://staging/~charlesk/indicator-datetime/lp-1362341-disable-one-time-ubuntu-alarms-after-notification into lp://staging/indicator-datetime/15.04

  1. lp-1362341-disable-one-time-ubuntu-alarms-after-notification
  2. Merge into trunk.15.04
Proposed by Charles Kerr
Status: Merged
Approved by: Ted Gould
Approved revision: 391
Merged at revision: 392
Proposed branch: lp://staging/~charlesk/indicator-datetime/lp-1362341-disable-one-time-ubuntu-alarms-after-notification
Merge into: lp://staging/indicator-datetime/15.04
Prerequisite: lp://staging/~charlesk/indicator-datetime/lp-1320880-shorter-notifications-for-calendar-events
Diff against target: 196 lines (+105/-5)
6 files modified
include/datetime/engine-eds.h (+3/-2)
include/datetime/engine-mock.h (+5/-2)
include/datetime/engine.h (+1/-0)
src/engine-eds.cpp (+82/-0)
src/main.cpp (+4/-1)
tests/manual (+10/-0)
To merge this branch: bzr merge lp://staging/~charlesk/indicator-datetime/lp-1362341-disable-one-time-ubuntu-alarms-after-notification
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+243940@code.staging.launchpad.net

Commit message

After a one-time Ubuntu alarm's notification is displayed, disable the alarm.

Description of the change

Description of the Change
=========================

This branch culls the bugfix for bug #1362341 from my development branch so that it's easier to review and to backport in isolation.

This patch adds the 'x-canonical-disabled' tag to the categories of one-time Ubuntu alarms after their notification has been shown.

Checklist
=========

> Are there any related MPs required for this MP to build/function as expected? Please list.

This MP stacks on top of lp:~charlesk/indicator-datetime/lp-1320880-shorter-notifications-for-calendar-events

> Is your branch in sync with latest trunk? (e.g. bzr pull lp:trunk -> no changes)

Yes

> Did the code build without warnings?

Yes

> Did the tests run successfully?

Yes

> Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

> If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

> What device (or emulator) has your component test plan been executed successfully on?

Krillin running ubuntu-touch/ubuntu-rtm/14.09

> What manual tests are relevant for this MP?

indicator-datetime/disable-one-time-alarms-after-notification

> Did you include a link to the MR Review Checklist Template to make your reviewer's life easier?

https://wiki.ubuntu.com/Process/Merges/Checklists/indicator-datetime

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:391
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/289/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/289/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ted Gould (ted) :
review: Needs Information
Revision history for this message
Charles Kerr (charlesk) :
Revision history for this message
Ted Gould (ted) :
review: Approve

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