From 27456ff7231b65ffc4409f76b167110e32790626 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Thu, 10 Aug 2006 23:54:34 +0200
Subject: [PATCH] Remove the theme hacks. sugar-jhbuild set this up fine now.

---
 shell/Session.py             |  4 +---
 shell/sugar-activity-factory |  9 ---------
 sugar/Makefile.am            |  1 -
 sugar/theme.py               | 10 ----------
 4 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 sugar/theme.py

diff --git a/shell/Session.py b/shell/Session.py
index 08d8d64f..985f1afa 100644
--- a/shell/Session.py
+++ b/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):
diff --git a/shell/sugar-activity-factory b/shell/sugar-activity-factory
index ba0e38a6..9e028f1c 100755
--- a/shell/sugar-activity-factory
+++ b/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()
diff --git a/sugar/Makefile.am b/sugar/Makefile.am
index 3820c401..2a06eb45 100644
--- a/sugar/Makefile.am
+++ b/sugar/Makefile.am
@@ -7,7 +7,6 @@ sugar_PYTHON =				\
 	bots.py				\
 	env.py				\
 	setup.py			\
-	theme.py			\
 	util.py				\
 	LogWriter.py
 
diff --git a/sugar/theme.py b/sugar/theme.py
deleted file mode 100644
index 628d188c..00000000
--- a/sugar/theme.py
+++ /dev/null
@@ -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', '')