Merge lp://staging/~alecu/ubuntu-sso-client/fix-100pct-links into lp://staging/ubuntu-sso-client

Proposed by Alejandro J. Cura
Status: Merged
Approved by: Natalia Bidart
Approved revision: 643
Merged at revision: 641
Proposed branch: lp://staging/~alecu/ubuntu-sso-client/fix-100pct-links
Merge into: lp://staging/ubuntu-sso-client
Diff against target: 48 lines (+9/-17)
1 file modified
bin/ubuntu-sso-login (+9/-17)
To merge this branch: bzr merge lp://staging/~alecu/ubuntu-sso-client/fix-100pct-links
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
Rodrigo Moya (community) Approve
Review via email: mp+37655@code.staging.launchpad.net

Commit message

Replace twisted gtk reactor with the standard gtk mainloop. (LP: #655327)

Description of the change

The twisted gtk reactor was being installed and used as the mainloop, even though twisted was not used (only trial is used for the tests). I've replaced this with the standard gtk main loop, and the webkit 100% usage issue is now gone.

For the record: pygtkwebkit + twisted gtk reactor somehow do not play nicely with each other.

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

In order to test this, when the sso registration dialog shows up, click on the Terms and Conditions button, and then click on some of the links of the T&C page that is shown inside the dialog. The linked page should open in your default browser, and the CPU usage of ubuntu-sso-client should not grow to 100%.

Revision history for this message
Rodrigo Moya (rodrigo-moya) :
review: Approve
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

The sighup_handler must not be removed, we should be able to stop the service somehow. We should replace the reactor.run with gtk.main_quit

review: Needs Fixing
643. By Alejandro J. Cura

restoring sighup handler to log when stopping

Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Much better!

review: Approve

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