From 51c08af67c23f639b7f17f4de001e952f595950a Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Wed, 26 Jul 2006 14:33:44 +0000 Subject: Add back the ip check, ipv6 needs to be disabled in the avahi daemon config for this to work though --- (limited to 'shell') diff --git a/shell/PresenceService/PresenceService.py b/shell/PresenceService/PresenceService.py index 72ef20e..86377b8 100644 --- a/shell/PresenceService/PresenceService.py +++ b/shell/PresenceService/PresenceService.py @@ -338,8 +338,7 @@ class PresenceService(object): owner_nick = env.get_nick_name() source_addr = service.get_source_address() objid = self._get_next_object_id() - # FIXME put this back: source_addr in self._local_addrs.values() - if name == owner_nick: + if name == owner_nick and source_addr in self._local_addrs.values(): buddy = Buddy.Owner(self._bus_name, objid, service) self._owner = buddy logging.debug("Owner is '%s'." % name) diff --git a/shell/sugar-presence-service b/shell/sugar-presence-service index 42d1126..b0f7f41 100755 --- a/shell/sugar-presence-service +++ b/shell/sugar-presence-service @@ -4,6 +4,7 @@ import logging import sugar.env from PresenceService import PresenceService +# FIXME this looks like duplicated level = sugar.env.get_logging_level() if level == 'debug': logging.basicConfig(level=logging.DEBUG, -- cgit v0.9.1