Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.topdeps1
-rw-r--r--.topmsg6
-rw-r--r--src/sugar/activity/activityfactory.py2
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
diff --git a/.topmsg b/.topmsg
new file mode 100644
index 0000000..11d435c
--- /dev/null
+++ b/.topmsg
@@ -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):