diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-08-15 11:47:21 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-08-15 11:47:21 (GMT) |
commit | fa90ec41aa79d349406dd1fd0084da061627bb2b (patch) | |
tree | 4c8b12760f1d6b497d33312fe92dbf710c73dd03 | |
parent | a6ef49b731cfc570c4f7fd6d4f9d500fb95995de (diff) | |
parent | b1c73852040cacccd1345967b59b7ce242975d73 (diff) |
Merge from master
Conflicts:
shell/HomeWindow.py
-rw-r--r-- | shell/HomeWindow.py | 2 | ||||
-rw-r--r-- | sugar/logger.py | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/shell/HomeWindow.py b/shell/HomeWindow.py index 7e93956..ee56781 100644 --- a/shell/HomeWindow.py +++ b/shell/HomeWindow.py @@ -16,6 +16,8 @@ class HomeWindow(gtk.Window): def __init__(self, shell): gtk.Window.__init__(self) + self._shell = shell + self.connect('realize', self.__realize_cb) canvas = goocanvas.CanvasView() diff --git a/sugar/logger.py b/sugar/logger.py index d47f8a5..9328058 100644 --- a/sugar/logger.py +++ b/sugar/logger.py @@ -80,6 +80,7 @@ class Handler(logging.Handler): def __exception_handler(typ, exc, tb): trace = StringIO() traceback.print_exception(typ, exc, tb, None, trace) + print >> sys.stderr, trace.getvalue() __queue.append(logging.ERROR, trace.getvalue()) |