Merge from master

Conflicts:

	shell/HomeWindow.py
This commit is contained in:
Marco Pesenti Gritti 2006-08-15 13:47:21 +02:00
commit fa90ec41aa
2 changed files with 3 additions and 0 deletions

View File

@ -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()

View File

@ -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())