Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/sugar/presence/PresenceService.py
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <mpg@redhat.com>2006-06-15 22:27:50 (GMT)
committer Marco Pesenti Gritti <mpg@redhat.com>2006-06-15 22:27:50 (GMT)
commit6a8e863a1647088348f8895763d379f0046e86af (patch)
treef129f8244239d07a75925d3d00954e5eb721d4ae /sugar/presence/PresenceService.py
parent7b507d545b2a928b62306c783aa19185afa994d3 (diff)
Fix the problem with service resolution (Dan please have a look...)
Diffstat (limited to 'sugar/presence/PresenceService.py')
-rw-r--r--sugar/presence/PresenceService.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/sugar/presence/PresenceService.py b/sugar/presence/PresenceService.py
index 8bbbde7..fe5f74f 100644
--- a/sugar/presence/PresenceService.py
+++ b/sugar/presence/PresenceService.py
@@ -256,6 +256,7 @@ class PresenceService(gobject.GObject):
def _resolve_service(self, interface, protocol, name, stype, domain, flags):
"""Resolve and lookup a ZeroConf service to obtain its address and TXT records."""
# Ask avahi to resolve this particular service
+ print 'Resolving service ' + name + ' ' + stype
self._server.ResolveService(int(interface), int(protocol), name,
stype, domain, avahi.PROTO_UNSPEC, dbus.UInt32(0), # use flags here maybe?
reply_handler=self._resolve_service_reply_cb_glue,
@@ -395,11 +396,11 @@ class PresenceService(gobject.GObject):
return
# Decompose service type if we can
- (uid, stype) = Service._decompose_service_type(stype)
+ (uid, dec_stype) = Service._decompose_service_type(stype)
if uid and util.validate_activity_uid(uid):
if uid not in self._activity_uids:
self._activity_uids.append(uid)
- self._allowed_service_types.append(stype)
+ self._allowed_service_types.append(dec_stype)
# Find unresolved services that match the service type
# we're now interested in, and resolve them