Merge lp://qastaging/~townsend/libertine/fix-pasted-trunk into lp://qastaging/libertine/trunk
Proposed by
Christopher Townsend
| Status: | Merged |
|---|---|
| Approved by: | Brandon Schaefer |
| Approved revision: | 158 |
| Merged at revision: | 158 |
| Proposed branch: | lp://qastaging/~townsend/libertine/fix-pasted-trunk |
| Merge into: | lp://qastaging/libertine/trunk |
| Diff against target: |
304 lines (+132/-63) 5 files modified
CMakeLists.txt (+0/-1) debian/control (+0/-1) pasted/CMakeLists.txt (+1/-1) pasted/pasted.cpp (+111/-57) pasted/pasted.h (+20/-3) |
| To merge this branch: | bzr merge lp://qastaging/~townsend/libertine/fix-pasted-trunk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Brandon Schaefer (community) | Approve | ||
| Stephen M. Webb (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Fix pasted such that the 400 ms polling timer is replaced with a threaded XNextEvent model.
Also, check whether the actual Mir surface has focus instead of relying on what X tells us.
Description of the change
This is a cherry pick of lp:libertine rev. 300 for fixing pasted before OTA13 goes out.
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
Code is just pulled from development branch, OK as is.