Merge lp://qastaging/~albertomilone/unity-settings-daemon/non-blocking-touch-mapping-wily into lp://qastaging/unity-settings-daemon

Proposed by Alberto Milone
Status: Merged
Approved by: Iain Lane
Approved revision: 4091
Merged at revision: 4092
Proposed branch: lp://qastaging/~albertomilone/unity-settings-daemon/non-blocking-touch-mapping-wily
Merge into: lp://qastaging/unity-settings-daemon
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://qastaging/~albertomilone/unity-settings-daemon/non-blocking-touch-mapping-wily
Reviewer Review Type Date Requested Status
Iain Lane Approve
Canonical Desktop Team Pending
Review via email: mp+266248@code.qastaging.launchpad.net

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.
Revision history for this message
Iain Lane (laney) wrote :

Basic logic mostly fine (not tested), some comments inline. I hope they make sense.

Style for this file is to not include {} when not required - i.e. if there's only one statement in that branch.

review: Needs Fixing
4091. By Alberto Milone

Keep track of processes and retries dinamically

Revision history for this message
Iain Lane (laney) wrote :

I think this is fine, thanks. Just some small comments to fix. Feel free to upload once that is done.

review: Approve
4092. By Alberto Milone

Add whitespaces and remove duplicate message

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches