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

[Alejandro J. Cura]

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

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.

[Alejandro J. Cura (alecu)]

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%.

[Rodrigo Moya (rodrigo-moya)]

review: Approve

[Natalia Bidart (nataliabidart)]

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

[lp:~alecu/ubuntu-sso-client/fix-100pct-links]

643. By Alejandro J. Cura on 2010-10-06

restoring sighup handler to log when stopping

[Natalia Bidart (nataliabidart)]

Much better!

review: Approve

=== modified file 'bin/ubuntu-sso-login'
--- bin/ubuntu-sso-login	2010-09-30 21:18:40 +0000
+++ bin/ubuntu-sso-login	2010-10-06 16:44:21 +0000
@@ -62,16 +62,15 @@
 
 
 def sighup_handler(*a, **kw):
-    """Stop the service.
-
-    This is not thread safe, see the link below for info:
-    www.listware.net/201004/gtk-devel-list/115067-unix-signals-in-glib.html
-    """
-    from twisted.internet import reactor
-    # Module 'twisted.internet.reactor' has no 'stop' member
-    # pylint: disable=E1101
+    """Stop the service."""
+    # This handler may be called in any thread, so is not thread safe.
+    # See the link below for info:
+    # www.listware.net/201004/gtk-devel-list/115067-unix-signals-in-glib.html
+    #
+    # gtk.main_quit and the logger methods are safe to be called from any thread.
+    # Just don't call other random stuff here.
     logger.info("Stoping Ubuntu SSO login manager since SIGHUP was received.")
-    reactor.stop()
+    gtk.main_quit()
 
 
 if __name__ == "__main__":
@@ -83,10 +82,6 @@
         logger.error("Ubuntu SSO login manager already running, quitting.")
         sys.exit(0)
 
-    logger.debug("Installing the Twisted gtk2reactor.")
-    from twisted.internet import gtk2reactor
-    gtk2reactor.install()
-
     logger.debug("Hooking up SIGHUP with handler %r.", sighup_handler)
     signal.signal(signal.SIGHUP, sighup_handler)
 
@@ -97,7 +92,4 @@
                                         bus=dbus.SessionBus()),
                    object_path=DBUS_CRED_PATH)
 
-    from twisted.internet import reactor
-    # Module 'twisted.internet.reactor' has no 'run' member
-    # pylint: disable=E1101
-    reactor.run()
+    gtk.main()