Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gajim
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
eta
gajim
Commits
2875fbda
Commit
2875fbda
authored
18 years ago
by
sb
Browse files
Options
Downloads
Patches
Plain Diff
add fixme notice to workaround for #2585
parent
f02d7e44
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/common/zeroconf/zeroconf.py
+3
-3
3 additions, 3 deletions
src/common/zeroconf/zeroconf.py
with
3 additions
and
3 deletions
src/common/zeroconf/zeroconf.py
+
3
−
3
View file @
2875fbda
...
...
@@ -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 us
ag
e
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
))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment