sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not pass the timeout argument if we are using the in-process console

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2006-08-16 00:30:50 +02:00
parent b1c7385204
commit 1cfd208f7b
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
shell/ConsoleWindow.py
View File

@ -47,10 +47,7 @@ class ConsoleDbusService(dbus.service.Object):
@dbus.service.method('org.laptop.Sugar.Console', @dbus.service.method('org.laptop.Sugar.Console',
in_signature="saias", out_signature="") in_signature="saias", out_signature="")
def log(self, module_id, levels, messages): def log(self, module_id, levels, messages):
i = 0 self._console.log(module_id, levels, messages)
while i < len(levels):
self._console.log(levels[i], module_id, messages[i])
i += 1
class ConsoleWindow(gtk.Window): class ConsoleWindow(gtk.Window):
def __init__(self): def __init__(self):
@ -122,6 +119,9 @@ class ConsoleWindow(gtk.Window):
page = self._nb.page_num(self._consoles[page_id]) page = self._nb.page_num(self._consoles[page_id])
self._nb.set_current_page(page) self._nb.set_current_page(page)
def log(self, level, page_id, message): def log(self, page_id, levels, messages):
console = self._get_console(page_id) console = self._get_console(page_id)
console.log(level, message) i = 0
while i < len(levels):
console.log(levels[i], messages[i])
i += 1

16
sugar/logger.py
View File

@ -25,10 +25,12 @@ class MessageQueue:
bus = dbus.SessionBus() bus = dbus.SessionBus()
con = bus._connection con = bus._connection
if dbus.dbus_bindings.bus_name_has_owner(con, CONSOLE_BUS_NAME): if dbus.dbus_bindings.bus_name_has_owner(con, CONSOLE_BUS_NAME):
print >> sys.stderr, 'Setup now'
self.setup_console() self.setup_console()
bus.add_signal_receiver(self.__name_owner_changed, else:
dbus_interface = "org.freedesktop.DBus", bus.add_signal_receiver(self.__name_owner_changed,
signal_name = "NameOwnerChanged") dbus_interface = "org.freedesktop.DBus",
signal_name = "NameOwnerChanged")
def setup_console(self): def setup_console(self):
bus = dbus.SessionBus() bus = dbus.SessionBus()
@ -51,8 +53,12 @@ class MessageQueue:
if self._console == None or len(self._messages) == 0: if self._console == None or len(self._messages) == 0:
return False return False
self._console.log(self._console_id, self._levels, if isinstance(self._console, dbus.Interface):
self._messages, timeout = 1000) 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._levels = []
self._messages = [] self._messages = []