summaryrefslogtreecommitdiff
path: root/portato/plugins
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.net>2008-05-21 21:13:05 +0200
committerRené 'Necoro' Neumann <necoro@necoro.net>2008-05-21 21:13:05 +0200
commitf4368fbfb9fd0de6f1d1625ffddee17b67926c89 (patch)
tree274c6fe882a2f22aa99d0c301fb90a882e379900 /portato/plugins
parent43509c27dd08219147e4bcdb0897ebb2f5ec22cc (diff)
parentc24b4970e48771a32155cbc79060c76d218fdd85 (diff)
downloadportato-f4368fbfb9fd0de6f1d1625ffddee17b67926c89.tar.gz
portato-f4368fbfb9fd0de6f1d1625ffddee17b67926c89.tar.bz2
portato-f4368fbfb9fd0de6f1d1625ffddee17b67926c89.zip
Merged from trunk
Diffstat (limited to '')
-rw-r--r--portato/plugins/dbus_init.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/portato/plugins/dbus_init.py b/portato/plugins/dbus_init.py
index 851562c..653af31 100644
--- a/portato/plugins/dbus_init.py
+++ b/portato/plugins/dbus_init.py
@@ -1,4 +1,10 @@
-from dbus.mainloop.glib import threads_init
+try:
+ from dbus.mainloop.glib import threads_init
+except ImportError:
+ threads_init = None
+
+from portato.constants import USE_CATAPULT
def dbus_init (*args):
- threads_init()
+ if USE_CATAPULT and threads_init is not None:
+ threads_init()