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-08-08 23:08:19 (GMT)
committer Marco Pesenti Gritti <marco@localhost.localdomain>2006-08-08 23:08:19 (GMT)
commitc6d59fd7b44e65d33cb0a607c1321f1a62405aa2 (patch)
treecd4530dda13a53d66807e527a09c025a46db96b4 /shell
parentf1821704e708e85aeb8dc1132ff96ba6ea235395 (diff)
Improve the activity api
Diffstat (limited to 'shell')
-rw-r--r--shell/ActivitiesModel.py2
-rw-r--r--shell/HomeWindow.py11
2 files changed, 10 insertions, 3 deletions
diff --git a/shell/ActivitiesModel.py b/shell/ActivitiesModel.py
index af45b0d..dfff160 100644
--- a/shell/ActivitiesModel.py
+++ b/shell/ActivitiesModel.py
@@ -1,5 +1,3 @@
-import xml.sax.saxutils
-
import gobject
from sugar.presence.PresenceService import PresenceService
diff --git a/shell/HomeWindow.py b/shell/HomeWindow.py
index e43f864..a0c9f82 100644
--- a/shell/HomeWindow.py
+++ b/shell/HomeWindow.py
@@ -5,6 +5,7 @@ import wnck
from sugar.activity import Activity
from ActivitiesModel import ActivitiesModel
+from sugar.presence.PresenceService import PresenceService
class NewActivityButton(gtk.MenuToolButton):
def __init__(self, home):
@@ -72,7 +73,15 @@ class ActivitiesGrid(gtk.VBox):
def __button_clicked_cb(self, button, info):
activity = self._shell.get_registry().get_activity(info.get_type())
- Activity.create(activity.get_id(), info.get_service())
+
+ activity_id = info.get_service().get_activity_id()
+ pservice = PresenceService()
+ activity_ps = pservice.get_activity(activity_id)
+
+ if activity_ps:
+ Activity.create(activity.get_id(), activity_ps)
+ else:
+ print 'Cannot start activity.'
class TasksGrid(gtk.VBox):
def __init__(self, home):