diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-08-16 17:55:34 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-08-16 17:55:34 (GMT) |
| commit | 7dddefe22902fd671fdcac19da83aa7c6874b065 (patch) | |
| tree | 2575da1d4a3f18dca35048dc6a965fadf96daa25 /sugar | |
| parent | 115eefb4c2bb8154f6834caa62be2bcba80f70dc (diff) | |
| parent | 9ad1fe62aeb5b360a2c6f7e81149b5b0669ce67a (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar into demo4
Diffstat (limited to 'sugar')
| -rw-r--r-- | sugar/logger.py | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/sugar/logger.py b/sugar/logger.py index 9328058..e5bc37c 100644 --- a/sugar/logger.py +++ b/sugar/logger.py @@ -20,19 +20,21 @@ class MessageQueue: self._console_id = console_id self._levels = [] self._messages = [] - + self._bus = dbus.SessionBus() + if self._console == None: - bus = dbus.SessionBus() - con = bus._connection + con = self._bus._connection if dbus.dbus_bindings.bus_name_has_owner(con, CONSOLE_BUS_NAME): self.setup_console() - bus.add_signal_receiver(self.__name_owner_changed, + else: + self._bus.add_signal_receiver( + self.__name_owner_changed, dbus_interface = "org.freedesktop.DBus", signal_name = "NameOwnerChanged") def setup_console(self): - bus = dbus.SessionBus() - proxy_obj = bus.get_object(CONSOLE_BUS_NAME, CONSOLE_OBJECT_PATH) + proxy_obj = self._bus.get_object(CONSOLE_BUS_NAME, + CONSOLE_OBJECT_PATH) self._console = dbus.Interface(proxy_obj, CONSOLE_IFACE) self._queue_log() @@ -51,8 +53,12 @@ class MessageQueue: if self._console == None or len(self._messages) == 0: return False - self._console.log(self._console_id, self._levels, - self._messages, timeout = 1000) + if isinstance(self._console, dbus.Interface): + self._console.log(self._console_id, self._levels, + self._messages, timeout = 1000) + else: + self._console.log(self._console_id, self._levels, + self._messages) self._levels = [] self._messages = [] |