Merge lp://qastaging/~mikemc/ubuntuone-control-panel/use-qt-timers into lp://qastaging/ubuntuone-control-panel
Proposed by
Mike McCracken
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Mike McCracken | ||||
| Approved revision: | 403 | ||||
| Merged at revision: | 400 | ||||
| Proposed branch: | lp://qastaging/~mikemc/ubuntuone-control-panel/use-qt-timers | ||||
| Merge into: | lp://qastaging/ubuntuone-control-panel | ||||
| Diff against target: |
299 lines (+72/-138) 2 files modified
ubuntuone/controlpanel/gui/qt/share_links_search.py (+9/-16) ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py (+63/-122) |
||||
| To merge this branch: | bzr merge lp://qastaging/~mikemc/ubuntuone-control-panel/use-qt-timers | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Roberto Alsina (community) | Approve | ||
| Brian Curtin (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- Use Qt timers to delay and coalesce IPC for files search. (LP: #1150316)
Description of the change
- Use Qt timers to delay and coalesce IPC for files search. (LP: #1150316)
Previous branch used twisted reactor.callLater, which doesn't work on linux and ended up being more complex, because re-scheduling a twisted pending call is handled differently if the call has already fired. With QTimer, you simply start() it again and it does the right thing.
TO TEST:
# IRL - try searching for something in the search tab.
# test suite: on linux:
xvfb-run u1trial -r qt4 --gui ubuntuone/
To post a comment you must log in.
Revision history for this message
| Roberto Alsina (ralsina) | # |
review:
Approve
Revision history for this message
| Ubuntu One Auto Pilot (otto-pilot) wrote | # |
Download full text (186.3 KiB)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks ok to me.