From d5f53ddd02cacda0dbeecba023ac2cf0b8b389f9 Mon Sep 17 00:00:00 2001 From: Sascha Silbe Date: Fri, 15 Oct 2010 07:48:18 +0000 Subject: Merge remote branch 'refs/remotes/origin/t/bug-1786' into HEAD --- diff --git a/.topdeps b/.topdeps new file mode 100644 index 0000000..9c9ac90 --- /dev/null +++ b/.topdeps @@ -0,0 +1 @@ +upstream/master diff --git a/.topmsg b/.topmsg new file mode 100644 index 0000000..11d435c --- /dev/null +++ b/.topmsg @@ -0,0 +1,6 @@ +From: Sascha Silbe +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 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): -- cgit v0.9.1