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

Unregister the chat service on destroy.

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2006-10-19 14:51:13 +02:00
parent 21aa37cc24
commit cf13a7ff5b
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
shell/model/BuddyModel.py
View File

@ -139,7 +139,4 @@ class BuddyModel(gobject.GObject):
def __buddy_current_activity_changed_cb(self, buddy, activity=None): def __buddy_current_activity_changed_cb(self, buddy, activity=None):
if not self._buddy: if not self._buddy:
return return
if activity:
self.emit('current-activity-changed', activity) self.emit('current-activity-changed', activity)
else:
self.emit('current-activity-changed')

2
shell/view/ActivityHost.py
View File

@ -150,6 +150,6 @@ class ActivityHost:
def _activity_closed_cb(self, shell, activity): def _activity_closed_cb(self, shell, activity):
if activity == self: if activity == self:
self.chat_hide() self._chat_window.destroy()
self._frame_was_visible = False self._frame_was_visible = False

5
sugar/chat/ActivityChat.py
View File

@ -26,6 +26,8 @@ class ActivityChat(GroupChat):
GroupChat.__init__(self) GroupChat.__init__(self)
self._chat_service = None self._chat_service = None
self.connect('destroy', self._destroy_cb)
self._activity = activity self._activity = activity
self._pservice.register_service_type(ActivityChat.SERVICE_TYPE) self._pservice.register_service_type(ActivityChat.SERVICE_TYPE)
self._pservice.connect('service-appeared', self._service_appeared_cb) self._pservice.connect('service-appeared', self._service_appeared_cb)
@ -59,3 +61,6 @@ class ActivityChat(GroupChat):
self._chat_service = self._pservice.share_activity(self._activity, self._chat_service = self._pservice.share_activity(self._activity,
stype=ActivityChat.SERVICE_TYPE) stype=ActivityChat.SERVICE_TYPE)
self._setup_stream(self._chat_service) self._setup_stream(self._chat_service)
def _destroy_cb(self, widget):
self._pservice.unregister_service(self._chat_service)