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

2006-10-19 09:52:55 -04:00
parent 5a3e7c3c0a 62659e2806
commit 4f54f7921f
18 changed files with 190 additions and 117 deletions
@@ -26,6 +26,8 @@ class ActivityChat(GroupChat):
 		GroupChat.__init__(self)
 		self._chat_service = None

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