Merge lp:~dobey/ubuntu-sso-client/fix-glib-main into lp:ubuntu-sso-client/stable-3-0

[dobey]

Refactor the glib main runner to not depend on GTK+/Gdk, but only on glib

[Roberto Alsina (ralsina)]

review: Approve

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'ubuntu_sso/main/glib.py'
--- ubuntu_sso/main/glib.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/main/glib.py	2012-08-09 20:59:20 +0000
@@ -30,11 +30,10 @@
 
 # pylint: disable=E0611,F0401
 
-# pylint: disable=W0621
-import dbus.mainloop.glib
-# pylint: enable=W0621
+from dbus.mainloop.glib import DBusGMainLoop
+from gi.repository import GLib
 
-from gi.repository import GLib, Gdk, Gtk
+GLIB_MAINLOOP = None  # global
 
 
 def timeout_func(*a, **kw):
@@ -44,16 +43,17 @@
 
 def shutdown_func(*a, **kw):
     """Delay import of dynamic bindings to avoid crashes."""
-    Gtk.main_quit()
+    GLIB_MAINLOOP.quit()
 
 
 def run_func(loop):
     """Delay import of dynamic bindings to avoid crashes."""
-    Gtk.main()
+    loop.run()
 
 
 def start_setup():
     """Setup the env to run the service."""
-    dbus.mainloop.glib.threads_init()
-    Gdk.threads_init()
-    dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+    DBusGMainLoop(set_as_default=True)
+    global GLIB_MAINLOOP  # pylint: disable=W0603
+    GLIB_MAINLOOP = loop = GLib.MainLoop()
+    return loop