Remove the theme hacks. sugar-jhbuild set this up fine now.

shell/Session.py

@@ -4,11 +4,10 @@ import gobject
 import time
 import dbus
 import dbus.dbus_bindings
-from sugar.presence import PresenceService
 
+from sugar.presence import PresenceService
 from Shell import Shell
 from Process import Process
-import sugar.theme
 import sugar.env
 
 class DbusProcess(Process):
@@ -61,7 +60,6 @@ class PresenceServiceProcess(Process):
 class Session:
 	"""Takes care of running the shell and all the sugar processes"""
 	def __init__(self, registry):
-		sugar.theme.setup()
 		self._registry = registry
 		
 	def start(self):

shell/sugar-activity-factory

@@ -1,11 +1,9 @@
 #!/usr/bin/python
-
 import sys
 import logging
 
 import pygtk
 pygtk.require('2.0')
-import gobject
 import gtk
 import dbus.glib
 
@@ -14,16 +12,9 @@ gtk.gdk.threads_init()
 dbus.glib.threads_init()
 
 from sugar.activity import ActivityFactory
-from sugar.LogWriter import LogWriter
-from sugar import theme
 
 logging.info('Starting activity factory %s' % sys.argv[1])
 
-theme.setup()
-
-#lw = LogWriter(sys.argv[1])
-#lw.start()
-
 ActivityFactory.register_factory(sys.argv[1], sys.argv[2])
 
 gtk.main()

sugar/Makefile.am

@@ -7,7 +7,6 @@ sugar_PYTHON =				\
 	bots.py				\
 	env.py				\
 	setup.py			\
-	theme.py			\
 	util.py				\
 	LogWriter.py
 

sugar/theme.py

@@ -1,10 +0,0 @@
-import gtk
-
-def setup():
-	settings = gtk.settings_get_default()
-		
-	if settings.get_property('gtk-theme-name') != 'olpc':
-		settings.set_string_property('gtk-theme-name', 'olpc', '')
-
-	if settings.get_property('gtk-icon-theme-name') != 'olpc':
-		settings.set_string_property('gtk-icon-theme-name', 'olpc', '')