Merge lp:~ralsina/ubuntuone-windows-installer/stop_reactor into lp:ubuntuone-windows-installer

Proposed by Roberto Alsina
Status: Merged
Approved by: Roberto Alsina
Approved revision: 4
Merged at revision: 5
Proposed branch: lp:~ralsina/ubuntuone-windows-installer/stop_reactor
Merge into: lp:ubuntuone-windows-installer
Diff against target: 14 lines (+2/-2)
1 file modified
ubuntuone_installer/gui/qt/gui.py (+2/-2)
To merge this branch: bzr merge lp:~ralsina/ubuntuone-windows-installer/stop_reactor
Reviewer Review Type Date Requested Status
Alejandro J. Cura (community) Approve
dobey (community) Approve
Review via email: mp+65391@code.launchpad.net

Commit message

Stop the reactor once the wizard is finished.

Description of the change

Stop the reactor once the wizard is finished.

To test (on Linux):

PYTHONPATH=. python bin/ubuntuone-installer-qt

Make the wizard finish in the usual way, and the application in the terminal should stop and not hang.

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
Alejandro J. Cura (alecu) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone_installer/gui/qt/gui.py'
2--- ubuntuone_installer/gui/qt/gui.py 2011-06-21 16:36:01 +0000
3+++ ubuntuone_installer/gui/qt/gui.py 2011-06-21 19:11:37 +0000
4@@ -39,8 +39,8 @@
5 # Invalid name "closeEvent"
6 # pylint: disable=C0103
7
8- def closeEvent(self, event):
9+ def done(self, result):
10 """The main window is being closed, call any custom callback."""
11 if self.close_callback is not None:
12 self.close_callback()
13- event.accept()
14+ QtGui.QWizard.done(self, result)

Subscribers

People subscribed via source and target branches