Cleanup browser model service on destroy.

Remove the activity service even if the owner is gone.

2 files changed, 5 insertions, 5 deletions

diff --git a/shell/PresenceService/PresenceService.py b/shell/PresenceService/PresenceService.py
index 56b54a3..ae7f7e0 100644
--- a/shell/PresenceService/PresenceService.py
+++ b/shell/PresenceService/PresenceService.py
@@ -536,6 +536,9 @@ class PresenceService(object):
 		if not service:
 			return False
 
+		self._dbus_helper.ServiceDisappeared(service.object_path())
+		self._handle_remove_activity_service(service)
+
 		# Decompose service name if we can
 		(actid, buddy_name) = Service.decompose_service_name(full_name)
 
@@ -545,10 +548,8 @@ class PresenceService(object):
 		except KeyError:
 			pass
 		else:
-			buddy.remove_service(service)
-			self._dbus_helper.ServiceDisappeared(service.object_path())
-			self._handle_remove_activity_service(service)
 			if not buddy.is_valid():
+				buddy.remove_service(service)
 				self._dbus_helper.BuddyDisappeared(buddy.object_path())
 				del self._buddies[buddy_name]
 		key = (service.get_full_name(), service.get_type())
diff --git a/shell/home/MeshGroup.py b/shell/home/MeshGroup.py
index bae483e..f7bc1c9 100644
--- a/shell/home/MeshGroup.py
+++ b/shell/home/MeshGroup.py
@@ -68,8 +68,7 @@ class MeshGroup(goocanvas.Group):
 
 		self._activities[item.get_id()] = item
 
-	def _activity_disappeared_cb(self, activity):
-		print 'remove'
+	def _activity_disappeared_cb(self, pservice, activity):
 		if self._activities.has_key(activity.get_id()):
 			self.remove_child(self._activities[activity.get_id()])
 			del self._activities[activity.get_id()]