Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xshell/sugar-activity2
-rwxr-xr-xshell/sugar-activity-factory9
2 files changed, 7 insertions, 4 deletions
diff --git a/shell/sugar-activity b/shell/sugar-activity
index 8e4b149..8a237ae 100755
--- a/shell/sugar-activity
+++ b/shell/sugar-activity
@@ -19,8 +19,6 @@
import sys
import os
-sys.path.insert(0, env.get_activities_dir())
-
from sugar.activity import ActivityFactory
ActivityFactory.create(sys.argv[1])
diff --git a/shell/sugar-activity-factory b/shell/sugar-activity-factory
index 7b543c2..66a9f07 100755
--- a/shell/sugar-activity-factory
+++ b/shell/sugar-activity-factory
@@ -18,6 +18,7 @@
import sys
import logging
+import os
import pygtk
pygtk.require('2.0')
@@ -29,10 +30,14 @@ import dbus.glib
gobject.threads_init()
dbus.glib.threads_init()
+from sugar import logger
+from sugar import env
+
+sys.path.insert(0, env.get_activities_dir())
+
from sugar.activity import ActivityFactory
-import sugar.logger
-sugar.logger.start(sys.argv[1])
+logger.start(sys.argv[1])
logging.info('Starting activity factory %s' % sys.argv[1])