diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-07-06 13:59:48 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-07-06 13:59:48 (GMT) |
commit | 85ff44db1c49e688fa17e7759f7d785eed8a8755 (patch) | |
tree | fba3826ea30c72a6e402b8d7d07980d4411c5d58 /shell/session | |
parent | e8acfd6be35476a19a52c3d3bf6acf66f2c1cb54 (diff) |
Forgot to commit changes... This breaks one-to-one chat,
I'm going to fix it.
Diffstat (limited to 'shell/session')
-rw-r--r-- | shell/session/session.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/shell/session/session.py b/shell/session/session.py index 1b5bec6..7de16c6 100644 --- a/shell/session/session.py +++ b/shell/session/session.py @@ -8,6 +8,7 @@ import gtk from shell import Shell from sugar import env +from sugar.activity import Activity class Session: def __init__(self): @@ -42,20 +43,21 @@ class Session: def _run_activity(self, activity_dir): env.add_to_python_path(activity_dir) - activities = [] for filename in os.listdir(activity_dir): if filename.endswith(".activity"): path = os.path.join(activity_dir, filename) cp = ConfigParser() cp.read([path]) - python_class = cp.get('Activity', "python_class") - activities.append(python_class) - for activity in activities: - args = [ 'python', '-m', activity ] - pid = os.spawnvp(os.P_NOWAIT, 'python', args) - self._activity_processes[activity] = pid - + activity_name = cp.get('Activity', "name") + activity_class = cp.get('Activity', "class") + + args = [ 'python', '-m', 'sugar/activity/Activity' ] + args.append(activity_name) + args.append(activity_class) + pid = os.spawnvp(os.P_NOWAIT, 'python', args) + self._activity_processes[activity_name] = pid + def _shell_close_cb(self, shell): self.shutdown() |