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

Cleanup activity closing

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2007-06-19 15:51:56 +02:00
parent e021bb271c
commit 737a8b3932
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sugar/activity/activity.py
View File

@ -84,6 +84,7 @@ class ActivityToolbar(gtk.Toolbar):
def _close_clicked_cb(self, button): def _close_clicked_cb(self, button):
self._activity.close() self._activity.close()
self._activity.destroy()
def _jobject_updated_cb(self, jobject): def _jobject_updated_cb(self, jobject):
self.title.set_text(jobject['title']) self.title.set_text(jobject['title'])
@ -182,8 +183,8 @@ class Activity(Window, gtk.Container):
""" """
Window.__init__(self) Window.__init__(self)
self.connect('destroy', self._destroy_cb)
self.connect('realize', self._realize_cb) self.connect('realize', self._realize_cb)
self.connect('delete-event', self._delete_event_cb)
self._active = False self._active = False
self._activity_id = handle.activity_id self._activity_id = handle.activity_id
@ -349,22 +350,18 @@ class Activity(Window, gtk.Container):
wm.set_bundle_id(window.window, self.get_service_name()) wm.set_bundle_id(window.window, self.get_service_name())
wm.set_activity_id(window.window, self._activity_id) wm.set_activity_id(window.window, self._activity_id)
def _destroy_cb(self, window): def _delete_event_cb(self, window, event):
"""Destroys our ActivityService and sharing service""" self.close()
return False
def close(self):
if self._bus: if self._bus:
del self._bus del self._bus
self._bus = None self._bus = None
if self._shared_activity: if self._shared_activity:
self._shared_activity.leave() self._shared_activity.leave()
def close(self): self.save()
if self._jobject:
try:
self.save()
except:
self.destroy()
raise
self.destroy()
def get_metadata(self): def get_metadata(self):
if self._jobject: if self._jobject: