Merge lp:~nataliabidart/ubuntu-sso-client/import-qt4reactor into lp:ubuntu-sso-client

[Natalia Bidart]

- Import qt4reactor properly (LP: #888722).
- Do not set glib dbus main loop as default in txsecrets library (LP: #889146).

[lp:~nataliabidart/ubuntu-sso-client/import-qt4reactor]

811. By Natalia Bidart on 2011-11-11

- Do not set glib dbus main loop as default in txsecrets library (LP: #889146).

812. By Natalia Bidart on 2011-11-11

Removed unused import.

[Manuel de la Peña (mandel)]

Code works and tests pass. I'll give a +1 now but with the condition that we talk with <email address hidden> to ask why he added a conditional import of gobject in the code of txsecrets.

Is there a particular reason besides allowing to use Gtk3? Should we do the same in ubuntu-sso-login?

review: Approve

[Alejandro J. Cura (alecu)]

+1
And to answer mandel's question: bug #829186.
Since this branch no longer needs gobject then those conditional imports are no longer needed.

review: Approve

=== modified file 'bin/windows-ubuntu-sso-login'
--- bin/windows-ubuntu-sso-login	2011-09-29 13:57:26 +0000
+++ bin/windows-ubuntu-sso-login	2011-11-11 16:21:23 +0000
@@ -25,8 +25,8 @@
 from PyQt4 import QtGui
 # need to create the QApplication before installing the reactor
 app = QtGui.QApplication(sys.argv)
-import qtreactor.qt4reactor
-qtreactor.qt4reactor.install()
+import qt4reactor
+qt4reactor.install()
 
 from twisted.internet import reactor, defer
 from twisted.spread.pb import PBServerFactory

=== modified file 'ubuntu_sso/gtk/gui.py'
--- ubuntu_sso/gtk/gui.py	2011-09-15 23:18:59 +0000
+++ ubuntu_sso/gtk/gui.py	2011-11-11 16:21:23 +0000
@@ -30,7 +30,6 @@
 import dbus
 import gtk
 
-from dbus.mainloop.glib import DBusGMainLoop
 from twisted.internet.defer import inlineCallbacks
 
 from ubuntu_sso import (
@@ -79,7 +78,6 @@
 # pylint: disable=E1101
 
 
-DBusGMainLoop(set_as_default=True)
 logger = setup_logging('ubuntu_sso.gui')
 
 # To be removed when Python bindings provide these constants

=== modified file 'ubuntu_sso/utils/txsecrets.py'
--- ubuntu_sso/utils/txsecrets.py	2011-09-06 11:55:03 +0000
+++ ubuntu_sso/utils/txsecrets.py	2011-11-11 16:21:23 +0000
@@ -21,22 +21,10 @@
  * http://code.confuego.org/secrets-xdg-specs/
 """
 
-import sys
-# pylint: disable=E0611,F0401
-if 'gobject' in sys.modules:
-    import gobject as GObject
-else:
-    from gi.repository import GObject
-# pylint: enable=E0611,F0401
 import dbus
-from dbus.mainloop.glib import DBusGMainLoop
-import dbus.mainloop.glib
+
 from twisted.internet.defer import Deferred
 
-GObject.threads_init()
-dbus.mainloop.glib.threads_init()
-DBusGMainLoop(set_as_default=True)
-
 BUS_NAME = "org.freedesktop.secrets"
 SERVICE_IFACE = "org.freedesktop.Secret.Service"
 PROMPT_IFACE = "org.freedesktop.Secret.Prompt"