Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@localhost.localdomain>2006-08-10 21:54:34 (GMT)
committer Marco Pesenti Gritti <marco@localhost.localdomain>2006-08-10 21:54:34 (GMT)
commit27456ff7231b65ffc4409f76b167110e32790626 (patch)
treeee29a1082145372fd0a524366b7204617c134c0c /shell
parent093a1981d50bbefc4e76a5c65b42baa76b095a81 (diff)
Remove the theme hacks. sugar-jhbuild set this up fine now.
Diffstat (limited to 'shell')
-rw-r--r--shell/Session.py4
-rwxr-xr-xshell/sugar-activity-factory9
2 files changed, 1 insertions, 12 deletions
diff --git a/shell/Session.py b/shell/Session.py
index 08d8d64..985f1af 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 ba0e38a..9e028f1 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()