Author: asterix Date: 2007-08-06 21:13:22 +0200 (Mon, 06 Aug 2007) New Revision: 8457

Modified: trunk/src/common/zeroconf/zeroconf_bonjour.py Log: don't fail when there is a name conflict

Modified: trunk/src/common/zeroconf/zeroconf_bonjour.py =================================================================== --- trunk/src/common/zeroconf/zeroconf_bonjour.py 2007-08-06 15:53:01 UTC (rev 8456) +++ trunk/src/common/zeroconf/zeroconf_bonjour.py 2007-08-06 19:13:22 UTC (rev 8457) @@ -224,12 +224,12 @@ self.service_sdRef = sdRef except pybonjour.BonjourError, e: self.service_add_fail_callback(e) - - gajim.log.debug('Publishing service %s of type %s' % (self.name, self.stype)) + else: + gajim.log.debug('Publishing service %s of type %s' % (self.name, self.stype))

- ready = select.select([sdRef], [], [], resolve_timeout) - if sdRef in ready[0]: - pybonjour.DNSServiceProcessResult(sdRef) + ready = select.select([sdRef], [], [], resolve_timeout) + if sdRef in ready[0]: + pybonjour.DNSServiceProcessResult(sdRef)

def announce(self): if not self.connected: @@ -297,8 +297,6 @@ self.browse_loop()

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)

try: