Merge from master
Conflicts: shell/HomeWindow.py
This commit is contained in:
commit
fa90ec41aa
@ -16,6 +16,8 @@ class HomeWindow(gtk.Window):
|
|||||||
def __init__(self, shell):
|
def __init__(self, shell):
|
||||||
gtk.Window.__init__(self)
|
gtk.Window.__init__(self)
|
||||||
|
|
||||||
|
self._shell = shell
|
||||||
|
|
||||||
self.connect('realize', self.__realize_cb)
|
self.connect('realize', self.__realize_cb)
|
||||||
|
|
||||||
canvas = goocanvas.CanvasView()
|
canvas = goocanvas.CanvasView()
|
||||||
|
@ -80,6 +80,7 @@ class Handler(logging.Handler):
|
|||||||
def __exception_handler(typ, exc, tb):
|
def __exception_handler(typ, exc, tb):
|
||||||
trace = StringIO()
|
trace = StringIO()
|
||||||
traceback.print_exception(typ, exc, tb, None, trace)
|
traceback.print_exception(typ, exc, tb, None, trace)
|
||||||
|
print >> sys.stderr, trace.getvalue()
|
||||||
|
|
||||||
__queue.append(logging.ERROR, trace.getvalue())
|
__queue.append(logging.ERROR, trace.getvalue())
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user