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

Fix service disappearance

Browse Source
This commit is contained in:
Dan Williams 2006-06-12 21:33:05 -04:00
parent 20d7582f1d
commit 21d1294c7a
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sugar/presence/PresenceService.py
View File

@ -244,21 +244,27 @@ class PresenceService(gobject.GObject):
def _service_disappeared_cb(self, interface, protocol, name, stype, domain, flags): def _service_disappeared_cb(self, interface, protocol, name, stype, domain, flags):
self._log("service '%s' of type '%s' in domain '%s' on %i.%i disappeared." % (name, stype, domain, interface, protocol)) self._log("service '%s' of type '%s' in domain '%s' on %i.%i disappeared." % (name, stype, domain, interface, protocol))
try: # If it's an unresolved service, remove it from our unresolved list
# Remove the service from the buddy found = self._find_service(self._unresolved_services, name=name,
buddy = self._buddies[name] stype=stype, domain=domain)
# FIXME: need to be more careful about how we remove services
# from buddies; this could be spoofed
service = buddy.get_service_of_type(stype)
buddy.remove_service(service)
if not buddy.is_valid():
self.emit("buddy-disappeared", buddy)
del self._buddies[name]
except KeyError:
pass
for service in found: for service in found:
self._unresolved_services.remove(service) self._unresolved_services.remove(service)
# Unresolved services by definition aren't assigned to a buddy
if not len(found):
try:
# Remove the service from the buddy
buddy = self._buddies[name]
# FIXME: need to be more careful about how we remove services
# from buddies; this could be spoofed
service = buddy.get_service_of_type(stype)
buddy.remove_service(service)
if not buddy.is_valid():
self.emit("buddy-disappeared", buddy)
del self._buddies[name]
except KeyError:
pass
return False return False
def _service_disappeared_cb_glue(self, interface, protocol, name, stype, domain, flags): def _service_disappeared_cb_glue(self, interface, protocol, name, stype, domain, flags):