sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2007-07-23 13:31:31 +02:00
commit 943c78ffa7
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
sugar/activity/activity.py
View File

@ -222,6 +222,8 @@ class Activity(Window, gtk.Container):
self._join_id = None self._join_id = None
self._can_close = True self._can_close = True
self._preview = None self._preview = None
self._updating_jobject = False
self._closing = False
shared_activity = handle.get_shared_activity() shared_activity = handle.get_shared_activity()
if shared_activity: if shared_activity:
@ -307,11 +309,27 @@ class Activity(Window, gtk.Container):
raise NotImplementedError raise NotImplementedError
def _internal_save_cb(self): def _internal_save_cb(self):
pass self._updating_jobject = False
if self._closing:
self._cleanup_jobject()
self.destroy()
def _internal_save_error_cb(self, err): def _internal_save_error_cb(self, err):
self._updating_jobject = False
if self._closing:
self._cleanup_jobject()
self.destroy()
logging.debug("Error saving activity object to datastore: %s" % err) logging.debug("Error saving activity object to datastore: %s" % err)
def _cleanup_jobject(self):
if self._jobject:
if self._owns_file and os.path.isfile(self._jobject.file_path):
logging.debug('_cleanup_jobject: removing %r' % self._jobject.file_path)
os.remove(self._jobject.file_path)
self._owns_file = False
self._jobject.destroy()
self._jobject = None
def _get_preview(self): def _get_preview(self):
preview_pixbuf = self.get_canvas_screenshot() preview_pixbuf = self.get_canvas_screenshot()
if preview_pixbuf is None: if preview_pixbuf is None:
@ -341,6 +359,10 @@ class Activity(Window, gtk.Container):
def save(self): def save(self):
"""Request that the activity is saved to the Journal.""" """Request that the activity is saved to the Journal."""
if self._updating_jobject:
return
#self.metadata['buddies'] = self._get_buddies() #self.metadata['buddies'] = self._get_buddies()
if self._preview is None: if self._preview is None:
self.metadata['preview'] = '' self.metadata['preview'] = ''
@ -356,6 +378,7 @@ 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, datastore.write(self._jobject,
reply_handler=self._internal_save_cb, reply_handler=self._internal_save_cb,
error_handler=self._internal_save_error_cb) error_handler=self._internal_save_error_cb)
@ -406,6 +429,8 @@ class Activity(Window, gtk.Container):
return True return True
def close(self): def close(self):
self._closing = True
if self._bus: if self._bus:
del self._bus del self._bus
self._bus = None self._bus = None
@ -414,13 +439,13 @@ class Activity(Window, gtk.Container):
self._preview = self._get_preview() self._preview = self._get_preview()
self.save() self.save()
if self._jobject: def destroy(self):
if self._owns_file and os.path.isfile(self._jobject.file_path): if self._updating_jobject:
os.remove(self._jobject.file_path) # Delay destruction
self._owns_file = False self.hide()
self._jobject.destroy() else:
self._jobject = None Window.destroy(self)
def get_metadata(self): def get_metadata(self):
if self._jobject: if self._jobject: