From 21f80278102ee2e441bab8e78b5560c2cd1602e0 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Fri, 20 Jul 2007 19:25:39 +0000
Subject: Fix resume of objects with no activity_id

---
(limited to 'sugar/datastore')

diff --git a/sugar/datastore/datastore.py b/sugar/datastore/datastore.py
index 9fca07a..23ca963 100644
--- a/sugar/datastore/datastore.py
+++ b/sugar/datastore/datastore.py
@@ -128,9 +128,12 @@ class DSObject(object):
         else:
             service_name = self.get_activities()[0].service_name
 
-            handle = ActivityHandle(object_id=self.object_id)
-            if self.metadata['activity_id']:
-                handle.activity_id = self.metadata['activity_id']
+            activity_id = self.metadata['activity_id']
+            if activity_id:
+                handle = ActivityHandle(object_id=self.object_id,
+                                        activity_id=activity_id)
+            else:
+                handle = ActivityHandle(object_id=self.object_id)
 
             activityfactory.create(service_name, handle)
 
--
cgit v0.9.1