diff options
| author | Sascha Silbe <sascha.silbe@caravan.local> | 2010-10-05 17:11:13 (GMT) |
|---|---|---|
| committer | Sascha Silbe <sascha.silbe@caravan.local> | 2010-10-05 17:11:13 (GMT) |
| commit | 3209088988656fe260d0659e5791fae3d0ddd43f (patch) | |
| tree | 07260114b5ab9c0ae6fe16c10f82aad8d85f40e0 | |
| parent | b91c2102b4b692f98a885847b7ce43f37715d593 (diff) | |
| parent | 0e931315d357efe1efa0633750fea04be0be9997 (diff) | |
Merge remote branch 'refs/remotes/origin/t/bug-1786' into HEAD
| -rw-r--r-- | .topdeps | 1 | ||||
| -rw-r--r-- | .topmsg | 6 | ||||
| -rw-r--r-- | src/sugar/activity/activityfactory.py | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/.topdeps b/.topdeps new file mode 100644 index 0000000..9c9ac90 --- /dev/null +++ b/.topdeps @@ -0,0 +1 @@ +upstream/master @@ -0,0 +1,6 @@ +From: Sascha Silbe <sascha-pgp@silbe.org> +Subject: [PATCH] fix oversight from direct D-Bus interfacing -> sugar.datastore.datastore conversion (#1786) + +Fix oversight from direct D-Bus interfacing -> sugar.datastore.datastore conversion. + +Signed-off-by: Sascha Silbe <sascha-pgp@silbe.org> diff --git a/src/sugar/activity/activityfactory.py b/src/sugar/activity/activityfactory.py index 46dc346..c318543 100644 --- a/src/sugar/activity/activityfactory.py +++ b/src/sugar/activity/activityfactory.py @@ -294,7 +294,7 @@ class ActivityCreationHandler(gobject.GObject): if count > 0: if count > 1: logging.debug("Multiple objects has the same activity_id.") - self._handle.object_id = jobjects[0]['uid'] + self._handle.object_id = jobjects[0].metadata['uid'] self._launch_activity() def _find_object_error_handler(self, err): |