diff options
Diffstat (limited to 'src/sugar/activity/activity.py')
| -rw-r--r-- | src/sugar/activity/activity.py | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/sugar/activity/activity.py b/src/sugar/activity/activity.py index 3cbc5d5..4a56d4b 100644 --- a/src/sugar/activity/activity.py +++ b/src/sugar/activity/activity.py @@ -500,8 +500,8 @@ class Activity(Window, gtk.Container): share_scope = SCOPE_PRIVATE - if handle.tree_id: - self._jobject = datastore.get(handle.tree_id, handle.version_id) + if handle.object_id: + self._jobject = datastore.get(handle.object_id) self.set_title(self._jobject.metadata['title']) if self._jobject.metadata.has_key('share-scope'): @@ -537,7 +537,7 @@ class Activity(Window, gtk.Container): else: logging.debug("Unknown share scope %r" % share_scope) - if handle.tree_id is None and create_jobject: + if handle.object_id is None and create_jobject: logging.debug('Creating a jobject.') self._jobject = datastore.create() title = _('%s Activity') % get_bundle_name() @@ -691,7 +691,7 @@ class Activity(Window, gtk.Container): """ raise NotImplementedError - def __save_cb(self, tree_id, version_id): + def __save_cb(self, object_id): logging.debug('Activity.__save_cb') self._updating_jobject = False if self._quit_requested: @@ -771,7 +771,7 @@ class Activity(Window, gtk.Container): logging.debug('Cannot save, no journal object.') return - logging.debug('Activity.save: (%r,%r)' % (self._jobject.tree_id, self._jobject.version_id)) + logging.debug('Activity.save: %r' % (self._jobject.object_id,)) if self._updating_jobject: logging.info('Activity.save: still processing a previous request.') @@ -799,13 +799,13 @@ class Activity(Window, gtk.Container): # Cannot call datastore.write async for creates: # https://dev.laptop.org/ticket/3071 - if self._jobject.tree_id is None: + if self._jobject.object_id is None: datastore.write(self._jobject, transfer_ownership=True) else: self._updating_jobject = True datastore.write(self._jobject, transfer_ownership=True, - reply_handler=self.__save_cb, + reply_handler=(lambda tree_id, version_id: self.__save_cb((tree_id,version_id))), error_handler=self.__save_error_cb) def copy(self): @@ -815,10 +815,9 @@ class Activity(Window, gtk.Container): Activities should not override this method. Instead, like save() do any copy work that needs to be done in write_file() """ - logging.debug('Activity.copy: (%r,%r)' % (self._jobject.tree_id, self._jobject.version_id)) + logging.debug('Activity.copy: %r' % (self._jobject.object_id,)) self.save() - self._jobject.tree_id = None - self._jobject.version_id = None + self._jobject.object_id = None def __privacy_changed_cb(self, shared_activity, param_spec): if shared_activity.props.private: @@ -1057,9 +1056,8 @@ def get_activity_root(): else: raise RuntimeError("No SUGAR_ACTIVITY_ROOT set.") -# SS: TODO: optionally pass version_id -def show_object_in_journal(tree_id): +def show_object_in_journal(object_id): bus = dbus.SessionBus() obj = bus.get_object(J_DBUS_SERVICE, J_DBUS_PATH) journal = dbus.Interface(obj, J_DBUS_INTERFACE) - journal.ShowObject(tree_id) + journal.ShowObject(object_id) |