diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-08-15 22:30:50 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-08-15 22:30:50 (GMT) |
| commit | 1cfd208f7bc6873b5fe7b610835fb7201363542d (patch) | |
| tree | fa27b866868ef9aa3455670055d227a6ecd52223 /sugar | |
| parent | b1c73852040cacccd1345967b59b7ce242975d73 (diff) | |
Do not pass the timeout argument if we are using the in-process console
Diffstat (limited to 'sugar')
| -rw-r--r-- | sugar/logger.py | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/sugar/logger.py b/sugar/logger.py index 9328058..7f9dab1 100644 --- a/sugar/logger.py +++ b/sugar/logger.py @@ -25,10 +25,12 @@ class MessageQueue: bus = dbus.SessionBus() con = bus._connection if dbus.dbus_bindings.bus_name_has_owner(con, CONSOLE_BUS_NAME): + print >> sys.stderr, 'Setup now' self.setup_console() - bus.add_signal_receiver(self.__name_owner_changed, - dbus_interface = "org.freedesktop.DBus", - signal_name = "NameOwnerChanged") + else: + bus.add_signal_receiver(self.__name_owner_changed, + dbus_interface = "org.freedesktop.DBus", + signal_name = "NameOwnerChanged") def setup_console(self): bus = dbus.SessionBus() @@ -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 = [] |