Merge lp://staging/~azzar1/unity/lp-1552537-trusty into lp://staging/unity/7.2
Proposed by
Andrea Azzarone
| Status: | Merged |
|---|---|
| Approved by: | Marco Trevisan (Treviño) |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 3838 |
| Proposed branch: | lp://staging/~azzar1/unity/lp-1552537-trusty |
| Merge into: | lp://staging/unity/7.2 |
| Diff against target: |
17 lines (+6/-2) 1 file modified
lockscreen/LockScreenController.cpp (+6/-2) |
| To merge this branch: | bzr merge lp://staging/~azzar1/unity/lp-1552537-trusty |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Marco Trevisan (Treviño) | Approve | ||
|
Review via email:
|
|||
Commit message
Don't use SetActivate from gnome-screensaver as it will not only deactivate the screensaver but also unlock the screen.
Description of the change
Don't use SetActivate from gnome-screensaver as it will not only deactivate the screensaver but also unlock the screen.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Grazie...