Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@localhost.localdomain>2006-07-26 14:33:44 (GMT)
committer Marco Pesenti Gritti <marco@localhost.localdomain>2006-07-26 14:33:44 (GMT)
commit51c08af67c23f639b7f17f4de001e952f595950a (patch)
treee1ef583836190f4a1c166e8c980b4fadfa5c5f01 /shell
parent8444bd63d6af1592ce1f29dd9b2df11a0967bb1e (diff)
Add back the ip check, ipv6 needs to be disabled in the avahi daemon
config for this to work though
Diffstat (limited to 'shell')
-rw-r--r--shell/PresenceService/PresenceService.py3
-rwxr-xr-xshell/sugar-presence-service1
2 files changed, 2 insertions, 2 deletions
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,