From 4f54f7921fa0a4abc93bbd938fb132067999f528 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Thu, 19 Oct 2006 13:52:55 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

---
(limited to 'sugar/chat')

diff --git a/sugar/chat/ActivityChat.py b/sugar/chat/ActivityChat.py
index 971b87d..1892672 100644
--- a/sugar/chat/ActivityChat.py
+++ b/sugar/chat/ActivityChat.py
@@ -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)
--
cgit v0.9.1