Split up the browser, some cleanups and

sugar/chat/chat.py

@@ -1,7 +1,5 @@
-#!/usr/bin/python -t
-# -*- tab-width: 4; indent-tabs-mode: t -*- 
+#!/usr/bin/env python
 
-import sys
 import base64
 import sha
 
@@ -28,7 +26,7 @@ import sugar.env
 
 import richtext
 
-PANGO_SCALE=1024 # Where is this defined?
+PANGO_SCALE = 1024 # Where is this defined?
 
 CHAT_SERVICE_TYPE = "_olpc_chat._tcp"
 CHAT_SERVICE_PORT = 6100
@@ -700,7 +698,5 @@ log_writer = LogWriter("Chat")
 log_writer.start()
 
 ChatShell.get_instance().open_group_chat()
-try:
-	gtk.main()
-except KeyboardInterrupt:
-	pass
+
+gtk.main()

sugar/chat/sketchpad/SketchPad.py

@@ -1,7 +1,6 @@
 import pygtk
 pygtk.require('2.0')
 import gtk
-import cairo
 
 from Sketch import Sketch
 
@@ -78,8 +77,8 @@ class SketchPad(gtk.DrawingArea):
 		d.setSVG(s)
 		return d.toXml()
 
-def test_quit(w, sketchpad):
-	print sketchpad.to_svg()
+def test_quit(w, skpad):
+	print skpad.to_svg()
 	gtk.main_quit()
 
 if __name__ == "__main__":