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

Use the service's _publisher_ address for buddy service verification, since that's the unicast address from which the buddy's service announcements are coming; not the service's

Browse Source 
outbound address
This commit is contained in:
Dan Williams 2006-06-19 21:19:05 -04:00
parent 78ee3d2b20
commit 7ba6033921
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sugar/presence/Buddy.py
View File

@ -31,7 +31,7 @@ class Buddy(gobject.GObject):
gobject.GObject.__init__(self) gobject.GObject.__init__(self)
self._services = {} self._services = {}
self._nick_name = service.get_name() self._nick_name = service.get_name()
self._address = service.get_address() self._address = service.get_publisher_address()
self._valid = False self._valid = False
self._icon = None self._icon = None
self._icon_tries = 0 self._icon_tries = 0
@ -70,8 +70,9 @@ class Buddy(gobject.GObject):
True if the service was successfully added, and False if it was not.""" True if the service was successfully added, and False if it was not."""
if service.get_name() != self._nick_name: if service.get_name() != self._nick_name:
return False return False
if service.get_publisher_address() != self._address: publisher_addr = service.get_publisher_address()
logging.error('Service publisher and buddy address doesnt match: %s %s' % (service.get_publisher_address(), self._address)) if publisher_addr != self._address:
logging.error('Service publisher and buddy address doesnt match: %s %s' % (publisher_addr, self._address))
return False return False
full_type = service.get_full_type() full_type = service.get_full_type()
if full_type in self._services.keys(): if full_type in self._services.keys():
@ -104,7 +105,7 @@ class Buddy(gobject.GObject):
def remove_service(self, service): def remove_service(self, service):
"""Remove a service from a buddy; ie, the activity was closed """Remove a service from a buddy; ie, the activity was closed
or the buddy went away.""" or the buddy went away."""
if service.get_address() != self._address: if service.get_publisher_address() != self._address:
return return
if service.get_name() != self._nick_name: if service.get_name() != self._nick_name:
return return