merge to tip of tree

This commit is contained in:
Dan Williams
2006-04-27 15:01:42 -04:00
parent 38c5e5847b
commit 81f45f1447
6 changed files with 26 additions and 43 deletions
-28
View File
@@ -1,28 +0,0 @@
#!/usr/bin/python
import sys
import os
if len(sys.argv) == 1:
# FIXME Start a session
# We are lucky and this
# currently behave as we want.
# The chat depends on the
# web browser, so both activities
# are spanned. But obviously we
# need something better.
import sugar.chat
sugar.chat.main()
elif sys.argv[1] == 'shell':
import sugar.shell
sugar.shell.main()
elif sys.argv[1] == 'chat':
import sugar.chat
sugar.chat.main()
elif sys.argv[1] == 'browser':
import sugar.browser
sugar.browser.main()
else:
print "Unkown activity"