Merge lp://staging/~laney/indicator-datetime/use-upower into lp://staging/~indicator-applet-developers/indicator-datetime/trunk.13.10
Proposed by
Iain Lane
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Mathieu Trudel-Lapierre | ||||
Approved revision: | 215 | ||||
Merged at revision: | 215 | ||||
Proposed branch: | lp://staging/~laney/indicator-datetime/use-upower | ||||
Merge into: | lp://staging/~indicator-applet-developers/indicator-datetime/trunk.13.10 | ||||
Diff against target: |
56 lines (+11/-10) 2 files modified
debian/rules (+1/-1) src/datetime-service.c (+10/-9) |
||||
To merge this branch: | bzr merge lp://staging/~laney/indicator-datetime/use-upower | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Pitt | Approve | ||
Mathieu Trudel-Lapierre | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email:
|
Commit message
Use logind instead of ConsoleKit to adjust the clock upon return from sleep.
Description of the change
We want to remove ConsoleKit dependencies from Ubuntu. indicator-datetime uses CK to be notified of system resume events in order to fix up the clock. You can do this with UPower, though. So no CK dep required.
It WFM - running under G_MESSAGES_
(process:15395): Indicator-
(process:15395): Indicator-
Tested on both a pure CK and a CK/logind system. Not a pure logind one - I don't have one of those.
To post a comment you must log in.
Please note that AFAIK this is going away in upower 1.0, as this functionality moved into logind. So perhaps this should be adjusted right away?