From 2875fbda4b7f2fae74c7a642218c22f35c38612c Mon Sep 17 00:00:00 2001 From: Stefan Bethge Date: Fri, 20 Oct 2006 23:19:57 +0000 Subject: [PATCH] add fixme notice to workaround for #2585 --- src/common/zeroconf/zeroconf.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/zeroconf/zeroconf.py b/src/common/zeroconf/zeroconf.py index 41beea713..fbaadfd1d 100755 --- a/src/common/zeroconf/zeroconf.py +++ b/src/common/zeroconf/zeroconf.py @@ -59,11 +59,11 @@ class Zeroconf: ## handlers for dbus callbacks def entrygroup_commit_error_CB(self, err): - # left for eventual later use + # left blank for possible later usage pass def error_callback1(self, err): - gajim.log.debug('RR' + str(err)) + gajim.log.debug('Error while resolving: ' + str(err)) def error_callback(self, err): gajim.log.debug(str(err)) @@ -116,6 +116,7 @@ class Zeroconf: for els in txt_array: key, val = '', None for c in els: + #FIXME: remove when outdated, this is for avahi < 0.6.14 if c < 0 or c > 255: c = '.' else: @@ -178,7 +179,6 @@ class Zeroconf: gajim.log.debug('Error while adding service. %s' % str(err)) if str(err) == 'Local name collision': alternative_name = self.server.GetAlternativeServiceName(self.username) - self.disconnect() self.name_conflictCB(alternative_name) return self.error_CB(_('Error while adding service. %s') % str(err))