Merge lp:~nataliabidart/ubuntu-sso-client/connect-after into lp:ubuntu-sso-client

Proposed by Natalia Bidart
Status: Merged
Approved by: Rodrigo Moya
Approved revision: 629
Merged at revision: 629
Proposed branch: lp:~nataliabidart/ubuntu-sso-client/connect-after
Merge into: lp:ubuntu-sso-client
Diff against target: 19 lines (+5/-1)
1 file modified
ubuntu_sso/gui.py (+5/-1)
To merge this branch: bzr merge lp:~nataliabidart/ubuntu-sso-client/connect-after
Reviewer Review Type Date Requested Status
Rodrigo Moya (community) Approve
John Lenton (community) Approve
Review via email: mp+36291@code.launchpad.net

Commit message

Avoiding having the main window freezing when pinging the U1 server (LP: #645162).

To post a comment you must log in.
Revision history for this message
John Lenton (chipaca) wrote :

Thank you.

review: Approve
Revision history for this message
Rodrigo Moya (rodrigo-moya) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu_sso/gui.py'
2--- ubuntu_sso/gui.py 2010-09-13 23:30:21 +0000
3+++ ubuntu_sso/gui.py 2010-09-22 13:01:03 +0000
4@@ -729,10 +729,14 @@
5 signal, method, iface)
6 remove(method, signal_name=signal, dbus_interface=iface)
7
8- # destroy main window
9+ # hide the main window
10 if self.window is not None:
11 self.window.hide()
12
13+ # process any pending events before emitting signals
14+ while gtk.events_pending():
15+ gtk.main_iteration()
16+
17 if len(args) > 0 and args[0] in self.cancels:
18 self.window.emit(SIG_USER_CANCELATION, self.app_name)
19 elif len(self._gtk_signal_log) > 0:

Subscribers

People subscribed via source and target branches