diff options
| author | Dan Williams <dcbw@redhat.com> | 2006-06-20 01:19:05 (GMT) |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2006-06-20 01:19:05 (GMT) |
| commit | 7ba603392173a8dd8e2624993dce209e67a89755 (patch) | |
| tree | f100f07aae5bedb93840e1aa2db45e62da3f6b83 /sugar/presence | |
| parent | 78ee3d2b20d11f76621368fcdc61009a1db0aff0 (diff) | |
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
outbound address
Diffstat (limited to 'sugar/presence')
| -rw-r--r-- | sugar/presence/Buddy.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sugar/presence/Buddy.py b/sugar/presence/Buddy.py index 5fd3c77..65405e8 100644 --- a/sugar/presence/Buddy.py +++ b/sugar/presence/Buddy.py @@ -31,7 +31,7 @@ class Buddy(gobject.GObject): gobject.GObject.__init__(self) self._services = {} self._nick_name = service.get_name() - self._address = service.get_address() + self._address = service.get_publisher_address() self._valid = False self._icon = None 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.""" if service.get_name() != self._nick_name: return False - if service.get_publisher_address() != self._address: - logging.error('Service publisher and buddy address doesnt match: %s %s' % (service.get_publisher_address(), self._address)) + publisher_addr = service.get_publisher_address() + if publisher_addr != self._address: + logging.error('Service publisher and buddy address doesnt match: %s %s' % (publisher_addr, self._address)) return False full_type = service.get_full_type() if full_type in self._services.keys(): @@ -104,7 +105,7 @@ class Buddy(gobject.GObject): def remove_service(self, service): """Remove a service from a buddy; ie, the activity was closed or the buddy went away.""" - if service.get_address() != self._address: + if service.get_publisher_address() != self._address: return if service.get_name() != self._nick_name: return |