diff options
| author | John (J5) Palmieri <quinticent@phuket.(none)> | 2006-10-03 18:27:51 (GMT) |
|---|---|---|
| committer | John (J5) Palmieri <quinticent@phuket.(none)> | 2006-10-03 18:27:51 (GMT) |
| commit | be29c542bf79de9c9b25e6f8336f685e2bed8b2b (patch) | |
| tree | 7fe040ef8dd89c57b11d3eef4e68c9d45dad5a21 /sugar | |
| parent | bd0e612f1ab86dd0d10d1a45ecd144e4721b1dc8 (diff) | |
Deprecate dbus.dbus_bindings import and use new name_has_owner
API when available
Diffstat (limited to 'sugar')
| -rw-r--r-- | sugar/logger.py | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/sugar/logger.py b/sugar/logger.py index 5282503..f41d48f 100644 --- a/sugar/logger.py +++ b/sugar/logger.py @@ -4,7 +4,12 @@ import traceback from cStringIO import StringIO import dbus -import dbus.dbus_bindings + +#internals of D-Bus Python are changing +#try not to use it in the future +if dbus.version < (0, 70, 0): + import dbus.dbus_bindings + import gobject __queue = None @@ -24,7 +29,14 @@ class MessageQueue: if self._console == None: con = self._bus._connection - if dbus.dbus_bindings.bus_name_has_owner(con, CONSOLE_BUS_NAME): + name_has_owner = False + + try: + name_has_owner = dbus.dbus_bindings.bus_name_has_owner(con, CONSOLE_BUS_NAME) + except: + name_has_owner = con.name_has_owner(CONSOLE_BUS_NAME) + + if name_has_owner: self.setup_console() else: self._bus.add_signal_receiver( |