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

add fixme notice to workaround for #2585

Browse source
This commit is contained in:
Stefan Bethge 2006-10-20 23:19:57 +00:00
parent f02d7e446e
commit 2875fbda4b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/common/zeroconf/zeroconf.py
View file

@ -59,11 +59,11 @@ class Zeroconf:
## handlers for dbus callbacks ## handlers for dbus callbacks
def entrygroup_commit_error_CB(self, err): def entrygroup_commit_error_CB(self, err):
# left for eventual later use # left blank for possible later usage
pass pass
def error_callback1(self, err): def error_callback1(self, err):
gajim.log.debug('RR' + str(err)) gajim.log.debug('Error while resolving: ' + str(err))
def error_callback(self, err): def error_callback(self, err):
gajim.log.debug(str(err)) gajim.log.debug(str(err))
@ -116,6 +116,7 @@ class Zeroconf:
for els in txt_array: for els in txt_array:
key, val = '', None key, val = '', None
for c in els: for c in els:
#FIXME: remove when outdated, this is for avahi < 0.6.14
if c < 0 or c > 255: if c < 0 or c > 255:
c = '.' c = '.'
else: else:
@ -178,7 +179,6 @@ class Zeroconf:
gajim.log.debug('Error while adding service. %s' % str(err)) gajim.log.debug('Error while adding service. %s' % str(err))
if str(err) == 'Local name collision': if str(err) == 'Local name collision':
alternative_name = self.server.GetAlternativeServiceName(self.username) alternative_name = self.server.GetAlternativeServiceName(self.username)
self.disconnect()
self.name_conflictCB(alternative_name) self.name_conflictCB(alternative_name)
return return
self.error_CB(_('Error while adding service. %s') % str(err)) self.error_CB(_('Error while adding service. %s') % str(err))