Indicator Date and Time

Merge lp://qastaging/~desrt/indicator-datetime/timedated into lp://qastaging/indicator-datetime/13.04

timedated
Merge into trunk.13.04

Proposed by desrt on 2013-03-04

Status:	Merged
Approved by:	Mathieu Trudel-Lapierre on 2013-03-26
Approved revision:	211
Merged at revision:	212
Proposed branch:	lp://qastaging/~desrt/indicator-datetime/timedated
Merge into:	lp://qastaging/indicator-datetime/13.04
Diff against target:	260 lines (+51/-89) 3 files modified data/datetime-dialog.ui (+1/-1) src/datetime-prefs.c (+44/-82) src/datetime-service.c (+6/-6)
To merge this branch:	bzr merge lp://qastaging/~desrt/indicator-datetime/timedated
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-03-26
Mathieu Trudel-Lapierre			Approve on 2013-03-26
Charles Kerr (community)		2013-03-04	Approve on 2013-03-04
Review via email: mp+151560@code.qastaging.launchpad.net

Commit message

Port to timedated instead of gnome-settings-daemon datetime mechanism

Description of the change

Port to timedated instead of gnome-settings-daemon datetime mechanism

Don't merge this until desktop team gets the needed g-s-d, g-c-c,
policykit-desktop-privileges, systemd-shim and ubuntu-system-service changes into the distro...

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-03-04:

FAILED: Continuous integration, rev:208
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~desrt/indicator-datetime/timedated/+merge/151560/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/34/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/34/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=raring,flavor=armhf/34/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=raring,flavor=i386/34/console
Coverity artifacts:
    http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=raring,flavor=i386/34//artifact/results/coverity/NO_COVERITY_DEFECTS.txt

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/34//rebuild/?

review: Needs Fixing (continuous-integration)

Revision history for this message

Charles Kerr (charlesk) wrote on 2013-03-04:

Looks good.

The only issue I see is the minor regression of not desensitizing the from-the-internet button when ntp isn't available, as required by the spec. This isn't a showstopper, since upstream will be adding an "is ntp supported?" call and we can fix the regression then.

lp://qastaging/~desrt/indicator-datetime/timedated updated on 2013-03-04

209. By desrt on 2013-03-04

Send proper arguments for SetTime call

vs. the gnome-settings-daemon DateTimeMechanism, the systemd version
adds an extra two boolean arguments and wants time in microseconds
instead of seconds.

Make sure we're doing that properly.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-03-04:

FAILED: Continuous integration, rev:209
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~desrt/indicator-datetime/timedated/+merge/151560/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/35/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=raring,flavor=armhf/35/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=raring,flavor=i386/35/console
Coverity artifacts:
    http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=raring,flavor=i386/35//artifact/results/coverity/NO_COVERITY_DEFECTS.txt

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/35//rebuild/?

review: Needs Fixing (continuous-integration)

lp://qastaging/~desrt/indicator-datetime/timedated updated on 2013-03-04

210. By desrt on 2013-03-04

preferences: Add CanNTP support

If timedated has the CanNTP property then use it to set the sensitivity
of the "Automatically from the internet" radio.

This property is only available in new versions of systemd, so if the
property is not set, leave the widget sensitive.

Revision history for this message

Charles Kerr (charlesk) wrote on 2013-03-04:

Thanks for doing the upstream patch!

It looks like the updated prefs patch here has an accidental copy-paste on line 261, we probably don't want to call toggle_ntp() twice each time priv->auto_radio is toggled.

lp://qastaging/~desrt/indicator-datetime/timedated updated on 2013-03-04

211. By desrt on 2013-03-04

prefs: remove second signal connection for toggle_ntp

Copy/paste error. Thanks Charles. :)

Revision history for this message

desrt (desrt) wrote on 2013-03-04:

Absolutely correct and a good catch.

Updated the branch again.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-03-04:

FAILED: Continuous integration, rev:210
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~desrt/indicator-datetime/timedated/+merge/151560/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/36/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=raring,flavor=armhf/36/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=raring,flavor=i386/36/console
Coverity artifacts:
    http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=raring,flavor=i386/36//artifact/results/coverity/NO_COVERITY_DEFECTS.txt

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/36//rebuild/?

review: Needs Fixing (continuous-integration)

Revision history for this message

Charles Kerr (charlesk) on 2013-03-04:

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-03-04:

FAILED: Continuous integration, rev:211
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~desrt/indicator-datetime/timedated/+merge/151560/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/37/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=raring,flavor=armhf/37/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=raring,flavor=i386/37/console
Coverity artifacts:
    http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=raring,flavor=i386/37//artifact/results/coverity/NO_COVERITY_DEFECTS.txt