~pitti/ubuntu-sso-client/gi-fixes

« back to all changes in this revision

Viewing changes to ubuntu_sso/utils/txsecrets.py

  • Committer: Martin Pitt
  • Date: 2011-08-23 05:58:20 UTC
  • Revision ID: martin.pitt@canonical.com-20110823055820-73rj8uw14al03g1y
ubuntu_sso/utils/txsecrets.py: Conditionally use GI or static gobject depending
on whether gobject is already loaded. That way this module works with both
static and GI programs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
21
21
 * http://code.confuego.org/secrets-xdg-specs/
22
22
"""
23
23
 
24
 
import gobject
 
24
import sys
 
25
if 'gobject' in sys.modules:
 
26
    import gobject as GObject
 
27
else:
 
28
    from gi.repository import GObject
25
29
import dbus
26
30
from dbus.mainloop.glib import DBusGMainLoop
27
31
import dbus.mainloop.glib
28
32
from twisted.internet.defer import Deferred
29
33
 
30
 
gobject.threads_init()
 
34
GObject.threads_init()
31
35
dbus.mainloop.glib.threads_init()
32
36
DBusGMainLoop(set_as_default=True)
33
37