Merge lp:~robert-ancell/unity-greeter/screensaver into lp:unity-greeter
Proposed by
Robert Ancell
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 1198 | ||||
Proposed branch: | lp:~robert-ancell/unity-greeter/screensaver | ||||
Merge into: | lp:unity-greeter | ||||
Diff against target: |
282 lines (+155/-18) 8 files modified
configure.ac (+1/-0) data/com.canonical.unity-greeter.gschema.xml (+4/-0) debian/control (+1/-0) src/Makefile.am (+1/-0) src/fixes.vapi (+16/-0) src/settings-daemon.vala (+124/-17) src/settings.vala (+7/-0) src/unity-greeter.vala (+1/-1) |
||||
To merge this branch: | bzr merge lp:~robert-ancell/unity-greeter/screensaver | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Terry (community) | Approve | ||
Sebastien Bacher | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Unity Greeter Development Team | Pending | ||
Review via email: mp+214470@code.launchpad.net |
Commit message
Allow unity-settings-
To post a comment you must log in.
I also think this merge might fix another suspected bug when gnome-screensaver sometimes runs in the greeter. We now make sure we have claimed the screensaver d-bus name before launching u-s-d.