Merge lp:~nataliabidart/ubuntu-sso-client/fix-100pct-links-stable into lp:ubuntu-sso-client/stable-1-0

[Natalia Bidart]

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

[John Lenton (chipaca)]

I don't know if this deserves a badge for finding the issue, or a scoop of icecream to the forehead for putting in there in the first place...

good job we fixed it, either way :)

review: Approve

[Vincenzo Di Somma (vds)]

Tests pass, code looks ok!

review: Approve

=== modified file 'bin/ubuntu-sso-login'
--- bin/ubuntu-sso-login	2010-10-08 22:05:12 +0000
+++ bin/ubuntu-sso-login	2010-10-12 12:17:46 +0000
@@ -64,16 +64,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__":
@@ -85,10 +84,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)
 
@@ -99,7 +94,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()