Cleanup browser model service on destroy.

Remove the activity service even if the owner is gone.
2006-09-12 13:21:18 +02:00
parent d65e8b88e7
commit 53f7cc1f34
4 changed files with 17 additions and 9 deletions
@@ -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())