From 50fbbe9b7dbed091933916f3f8176036fce9d5ff Mon Sep 17 00:00:00 2001 From: Stefan Bethge Date: Mon, 19 Nov 2007 03:34:40 +0000 Subject: [PATCH] fix link-local collision detection --- src/common/zeroconf/zeroconf_avahi.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/zeroconf/zeroconf_avahi.py b/src/common/zeroconf/zeroconf_avahi.py index c0046b123..626d1be32 100644 --- a/src/common/zeroconf/zeroconf_avahi.py +++ b/src/common/zeroconf/zeroconf_avahi.py @@ -176,7 +176,7 @@ class Zeroconf: def service_add_fail_callback(self, err): gajim.log.debug('Error while adding service. %s' % str(err)) - if str(err) == 'Local name collision': + if 'Local name collision' in str(err): alternative_name = self.server.GetAlternativeServiceName(self.username) self.name_conflictCB(alternative_name) return @@ -198,6 +198,7 @@ class Zeroconf: def entrygroup_state_changed_callback(self, state, error): # the name is already present, so recreate if state == self.avahi.ENTRY_GROUP_COLLISION: + gajim.log.debug('zeroconf.py: local name collision') self.service_add_fail_callback('Local name collision') elif state == self.avahi.ENTRY_GROUP_FAILURE: self.disconnect()