diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-08-30 14:38:05 (GMT) |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-08-30 14:38:05 (GMT) |
commit | 93dd18ff0aace20b18b0484fa4cbed69299b954c (patch) | |
tree | dd67bc6571e2597a4f36a583092ff2145ea88f96 /sugar/activity | |
parent | f1024c3b0aec9360bcb9a1ce8e380e39009f86ff (diff) | |
parent | 142ce1cb119cebb12db4640b568386b1cde26e13 (diff) |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Diffstat (limited to 'sugar/activity')
-rw-r--r-- | sugar/activity/activityfactory.py | 3 | ||||
-rw-r--r-- | sugar/activity/activityhandle.py | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/sugar/activity/activityfactory.py b/sugar/activity/activityfactory.py index d7d6d92..a7d02f3 100644 --- a/sugar/activity/activityfactory.py +++ b/sugar/activity/activityfactory.py @@ -122,7 +122,8 @@ class ActivityCreationHandler(gobject.GObject): error_handler=self._notify_launch_error_handler) if not os.path.exists('/etc/olpc-security'): - self._factory.create(self._activity_handle.get_dict(), + handle = self._activity_handle.get_dict() + self._factory.create(dbus.Dictionary(handle, signature='ss'), timeout=120 * 1000, reply_handler=self._no_reply_handler, error_handler=self._create_error_handler) diff --git a/sugar/activity/activityhandle.py b/sugar/activity/activityhandle.py index 0f2f2d9..8e90e70 100644 --- a/sugar/activity/activityhandle.py +++ b/sugar/activity/activityhandle.py @@ -67,15 +67,13 @@ class ActivityHandle(object): def get_dict(self): """Retrieve our settings as a dictionary""" - result = { } - if self.activity_id: - result['activity_id'] = str(self.activity_id) + result = { 'activity_id' : self.activity_id } if self.pservice_id: - result['pservice_id'] = str(self.pservice_id) + result['pservice_id'] = self.pservice_id if self.object_id: - result['object_id'] = str(self.object_id) + result['object_id'] = self.object_id if self.uri: - result['uri'] = str(self.uri) + result['uri'] = self.uri return result |