Do sync the DS creates.
This commit is contained in:
parent
ccb0aaaa28
commit
e9449d0ab0
@ -404,12 +404,14 @@ class Activity(Window, gtk.Container):
|
|||||||
raise NotImplementedError
|
raise NotImplementedError
|
||||||
|
|
||||||
def _internal_save_cb(self):
|
def _internal_save_cb(self):
|
||||||
|
logging.debug('Activity._internal_save_cb')
|
||||||
self._updating_jobject = False
|
self._updating_jobject = False
|
||||||
if self._closing:
|
if self._closing:
|
||||||
self._cleanup_jobject()
|
self._cleanup_jobject()
|
||||||
self.destroy()
|
self.destroy()
|
||||||
|
|
||||||
def _internal_save_error_cb(self, err):
|
def _internal_save_error_cb(self, err):
|
||||||
|
logging.debug('Activity._internal_save_error_cb')
|
||||||
self._updating_jobject = False
|
self._updating_jobject = False
|
||||||
if self._closing:
|
if self._closing:
|
||||||
self._cleanup_jobject()
|
self._cleanup_jobject()
|
||||||
@ -466,6 +468,7 @@ class Activity(Window, gtk.Container):
|
|||||||
logging.debug('Activity.save: %r' % self._jobject.object_id)
|
logging.debug('Activity.save: %r' % self._jobject.object_id)
|
||||||
|
|
||||||
if self._updating_jobject:
|
if self._updating_jobject:
|
||||||
|
logging.info('Activity.save: still processing a previous request.')
|
||||||
return
|
return
|
||||||
|
|
||||||
buddies_dict = self._get_buddies()
|
buddies_dict = self._get_buddies()
|
||||||
@ -488,14 +491,20 @@ class Activity(Window, gtk.Container):
|
|||||||
self._jobject.file_path = file_path
|
self._jobject.file_path = file_path
|
||||||
except NotImplementedError:
|
except NotImplementedError:
|
||||||
pass
|
pass
|
||||||
self._updating_jobject = True
|
|
||||||
datastore.write(self._jobject,
|
# Cannot call datastore.write async for creates: https://dev.laptop.org/ticket/3071
|
||||||
transfer_ownership=True,
|
if self._jobject.object_id is None:
|
||||||
reply_handler=self._internal_save_cb,
|
datastore.write(self._jobject, transfer_ownership=True)
|
||||||
error_handler=self._internal_save_error_cb)
|
else:
|
||||||
|
self._updating_jobject = True
|
||||||
|
datastore.write(self._jobject,
|
||||||
|
transfer_ownership=True,
|
||||||
|
reply_handler=self._internal_save_cb,
|
||||||
|
error_handler=self._internal_save_error_cb)
|
||||||
|
|
||||||
def copy(self):
|
def copy(self):
|
||||||
logging.debug('Activity.copy: %r' % self._jobject.object_id)
|
logging.debug('Activity.copy: %r' % self._jobject.object_id)
|
||||||
|
self._preview = self._get_preview()
|
||||||
self.save()
|
self.save()
|
||||||
self._jobject.object_id = None
|
self._jobject.object_id = None
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user