copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

don't fail when there is a name conflict

Browse source
This commit is contained in:
Yann Leboulanger 2007-08-06 19:13:22 +00:00
parent 260464706e
commit 28cb6c6bb4
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/common/zeroconf/zeroconf_bonjour.py
View file

@ -224,12 +224,12 @@ class Zeroconf:
self.service_sdRef = sdRef self.service_sdRef = sdRef
except pybonjour.BonjourError, e: except pybonjour.BonjourError, e:
self.service_add_fail_callback(e) self.service_add_fail_callback(e)
else:
gajim.log.debug('Publishing service %s of type %s' % (self.name, self.stype)) gajim.log.debug('Publishing service %s of type %s' % (self.name, self.stype))
ready = select.select([sdRef], [], [], resolve_timeout) ready = select.select([sdRef], [], [], resolve_timeout)
if sdRef in ready[0]: if sdRef in ready[0]:
pybonjour.DNSServiceProcessResult(sdRef) pybonjour.DNSServiceProcessResult(sdRef)
def announce(self): def announce(self):
if not self.connected: if not self.connected:
@ -297,8 +297,6 @@ class Zeroconf:
self.browse_loop() self.browse_loop()
for val in self.contacts.values(): for val in self.contacts.values():
print val[C_BARE_NAME]
print val[C_DOMAIN]
resolve_sdRef = pybonjour.DNSServiceResolve(0, pybonjour.kDNSServiceInterfaceIndexAny, val[C_BARE_NAME], self.stype+'.', val[C_DOMAIN]+'.', self.service_resolved_all_callback) resolve_sdRef = pybonjour.DNSServiceResolve(0, pybonjour.kDNSServiceInterfaceIndexAny, val[C_BARE_NAME], self.stype+'.', val[C_DOMAIN]+'.', self.service_resolved_all_callback)
try: try: