Merge lp://staging/~albertomilone/unity-settings-daemon/non-blocking-touch-mapping-trusty into lp://staging/unity-settings-daemon/14.04
Proposed by
Alberto Milone
| Status: | Merged |
|---|---|
| Approved by: | Iain Lane |
| Approved revision: | 4045 |
| Merged at revision: | 4044 |
| Proposed branch: | lp://staging/~albertomilone/unity-settings-daemon/non-blocking-touch-mapping-trusty |
| Merge into: | lp://staging/unity-settings-daemon/14.04 |
| Diff against target: |
231 lines (+156/-18) 1 file modified
plugins/xrandr/gsd-xrandr-manager.c (+156/-18) |
| To merge this branch: | bzr merge lp://staging/~albertomilone/unity-settings-daemon/non-blocking-touch-mapping-trusty |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Iain Lane (community) | Approve | ||
| Canonical Desktop Team | Pending | ||
|
Review via email:
|
|||
Commit message
Make touchscreen mapping non-blocking, and kill it if it takes more than 3 seconds; finally, in case of failure, try again after a few seconds. This helps on resume from S3 (LP: #1471708).
Description of the change
Make touchscreen mapping non-blocking, and kill it if it takes more than 3 seconds; finally, in case of failure, try again after a few seconds. This helps on resume from S3 (LP: #1471708).
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
Cool