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-12-18 12:47:49 (GMT)
committer Marco Pesenti Gritti <marco@localhost.localdomain>2006-12-18 12:47:49 (GMT)
commite0bd5d1df41f1d77ae8bd66c3c2a0ab9143595cb (patch)
treec5c86920fb8815fab68daaa1d3a394c590a8cc12 /shell
parent09b096d4d0feb92e31a4e132a1f15ec3d66a3860 (diff)
Cleanup activity factory startup, remove duplicated argument from the Exec field
Diffstat (limited to 'shell')
-rwxr-xr-xshell/sugar-activity-factory14
1 files changed, 3 insertions, 11 deletions
diff --git a/shell/sugar-activity-factory b/shell/sugar-activity-factory
index 6065ba3..2dc8c3b 100755
--- a/shell/sugar-activity-factory
+++ b/shell/sugar-activity-factory
@@ -17,30 +17,22 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
import sys
-import logging
-import os
import pygtk
pygtk.require('2.0')
import gobject
import gtk
+
import dbus.glib
# Work around for dbus mutex locking issue
gobject.threads_init()
dbus.glib.threads_init()
-from sugar import logger
-from sugar import env
from sugar.activity import ActivityFactory
-logger.start(sys.argv[1])
-
-logging.info('Starting activity factory %s' % sys.argv[1])
-
-if len(sys.argv) > 3:
- sys.path.append(sys.argv[3])
+sys.path.append(sys.argv[2])
-ActivityFactory.register_factory(sys.argv[1], sys.argv[2])
+ActivityFactory.start_factory(sys.argv[1], sys.argv[2])
gtk.main()