diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-07-27 08:35:59 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-07-27 08:35:59 (GMT) |
commit | 1d370ca8e5b8f4f4b863adb7bb9ea39fe885d284 (patch) | |
tree | 11a7030066f1218a68fd608e02557873f6ad625b /shell | |
parent | d778d45b13eb261d623d426097bf36bf6470a398 (diff) |
Minor fixes
Diffstat (limited to 'shell')
-rwxr-xr-x | shell/Shell.py | 4 | ||||
-rwxr-xr-x | shell/sugar | 3 | ||||
-rwxr-xr-x | shell/sugar-activity-factory | 7 | ||||
-rwxr-xr-x | shell/sugar-presence-service | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/shell/Shell.py b/shell/Shell.py index 4176b72..680f94f 100755 --- a/shell/Shell.py +++ b/shell/Shell.py @@ -2,11 +2,9 @@ import os import dbus import dbus.glib -import pygtk -pygtk.require('2.0') import gtk -import wnck import gobject +import wnck from sugar.LogWriter import LogWriter from ActivityRegistry import ActivityRegistry diff --git a/shell/sugar b/shell/sugar index cff3c11..132c2fe 100755 --- a/shell/sugar +++ b/shell/sugar @@ -5,6 +5,9 @@ import os import pwd import random +import pygtk +pygtk.require('2.0') + def add_to_bin_path(path): if os.environ.has_key('PATH'): old_path = os.environ['PATH'] diff --git a/shell/sugar-activity-factory b/shell/sugar-activity-factory index 53789d4..c29c074 100755 --- a/shell/sugar-activity-factory +++ b/shell/sugar-activity-factory @@ -1,6 +1,7 @@ #!/usr/bin/python import sys +import logging import pygtk pygtk.require('2.0') @@ -10,10 +11,12 @@ from sugar.activity import Activity 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() +lw = LogWriter(sys.argv[1]) +lw.start() if len(sys.argv) == 4: Activity.register_factory(sys.argv[1], sys.argv[2], sys.argv[3]) diff --git a/shell/sugar-presence-service b/shell/sugar-presence-service index b0f7f41..4b939c4 100755 --- a/shell/sugar-presence-service +++ b/shell/sugar-presence-service @@ -10,4 +10,6 @@ if level == 'debug': logging.basicConfig(level=logging.DEBUG, format='%(levelname)s %(message)s') +logging.info('Starting presence service') + PresenceService.main() |