Merge lp://staging/~3v1n0/gnome-screensaver/use-unity-lockscreen into lp://staging/ubuntu/trusty/gnome-screensaver
Proposed by
Marco Trevisan (Treviño)
| Status: | Merged |
|---|---|
| Merge reported by: | Martin Pitt |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~3v1n0/gnome-screensaver/use-unity-lockscreen |
| Merge into: | lp://staging/ubuntu/trusty/gnome-screensaver |
| Diff against target: |
2508 lines (+2357/-2) 10 files modified
.pc/33_unity_lockscreen_on_lock.patch/src/gs-manager.c (+1365/-0) .pc/33_unity_lockscreen_on_lock.patch/src/gs-manager.h (+99/-0) .pc/33_unity_lockscreen_on_lock.patch/src/gs-monitor.c (+506/-0) .pc/applied-patches (+1/-0) debian/changelog (+7/-0) debian/patches/33_unity_lockscreen_on_lock.patch (+242/-0) debian/patches/series (+1/-0) src/gs-manager.c (+24/-2) src/gs-manager.h (+1/-0) src/gs-monitor.c (+111/-0) |
| To merge this branch: | bzr merge lp://staging/~3v1n0/gnome-screensaver/use-unity-lockscreen |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Robert Ancell | Approve | ||
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Commit message
debian/
- use unity lockscreen to lock when available (LP: #878836)
Description of the change
GSManager: if we're in Unity session, use the embedded Lockscreen instead of the one of GS
To post a comment you must log in.
Revision history for this message
| Martin Pitt (pitti) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
So, you are using gnome-screensaver to action the lock event and passing it to Unity? I would have expected you just to access the logind D-Bus interface from Unity and then just disable gnome-screensaver if you detected Unity. (so gnome-screensaver wasn't involved anymore).
I guess this method will work though, it just seems a bit complicated.