More cleanups and some fixes

sugar/Makefile.am

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

sugar/__init__.py

@@ -1,11 +0,0 @@
-import pygtk
-pygtk.require('2.0')
-import gtk
-
-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', '')

sugar/activity/Activity.py

@@ -11,6 +11,7 @@ import gtk, gobject
 from sugar.LogWriter import LogWriter
 from sugar import keybindings
 import sugar.util
+import sugar.theme
 
 SHELL_SERVICE_NAME = "caom.redhat.Sugar.Shell"
 SHELL_SERVICE_PATH = "/com/redhat/Sugar/Shell"
@@ -82,18 +83,10 @@ def create(activity_name, service = None, args = None):
 	else:
 		factory.create()		
 
-def _get_registry():
-	bus = dbus.SessionBus()
-	proxy_obj = bus.get_object("com.redhat.Sugar.ActivityRegistry",
-							   "/com/redhat/Sugar/ActivityRegistry")
-	return dbus.Interface(proxy_obj, "com.redhat.Sugar.ActivityRegistry")
-
-def list_activities():
-	registry = _get_registry()
-	return registry.list_activities()
-
 def main(activity_name, activity_class):
 	"""Starts the activity main loop."""
+	sugar.theme.setup()
+
 	log_writer = LogWriter(activity_name)
 	log_writer.start()
 

sugar/theme.py

@@ -0,0 +1,10 @@
+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', '')