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
John Smith
gajim
Commits
23f73004
Commit
23f73004
authored
15 years ago
by
Yann Leboulanger
Browse files
Options
Downloads
Patches
Plain Diff
[Mattj] Fix connection to facebook server that don't understand ver="" in roster query. Fixes #5600
parent
708d94a3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/common/connection_handlers.py
+6
-1
6 additions, 1 deletion
src/common/connection_handlers.py
src/common/xmpp/protocol.py
+1
-0
1 addition, 0 deletions
src/common/xmpp/protocol.py
src/common/xmpp/roster_nb.py
+3
-2
3 additions, 2 deletions
src/common/xmpp/roster_nb.py
with
10 additions
and
3 deletions
src/common/connection_handlers.py
+
6
−
1
View file @
23f73004
...
...
@@ -636,9 +636,14 @@ class ConnectionVcard:
else
:
if
iq_obj
.
getErrorCode
()
not
in
(
'
403
'
,
'
406
'
,
'
404
'
):
self
.
private_storage_supported
=
False
# We can now continue connection by requesting the roster
version
=
gajim
.
config
.
get_per
(
'
accounts
'
,
self
.
name
,
version
=
None
if
con
.
Stream
.
features
.
getTag
(
'
ver
'
,
namespace
=
common
.
xmpp
.
NS_ROSTER_VER
):
version
=
gajim
.
config
.
get_per
(
'
accounts
'
,
self
.
name
,
'
roster_version
'
)
iq_id
=
self
.
connection
.
initRoster
(
version
=
version
)
self
.
awaiting_answers
[
iq_id
]
=
(
ROSTER_ARRIVED
,
)
elif
self
.
awaiting_answers
[
id_
][
0
]
==
ROSTER_ARRIVED
:
...
...
This diff is collapsed.
Click to expand it.
src/common/xmpp/protocol.py
+
1
−
0
View file @
23f73004
...
...
@@ -96,6 +96,7 @@ NS_PUBSUB_OWNER ='http://jabber.org/protocol/pubsub#owner'
NS_REGISTER
=
'
jabber:iq:register
'
NS_ROSTER
=
'
jabber:iq:roster
'
NS_ROSTERX
=
'
http://jabber.org/protocol/rosterx
'
# XEP-0144
NS_ROSTER_VER
=
'
urn:xmpp:features:rosterver
'
# XEP-0273
NS_RPC
=
'
jabber:iq:rpc
'
# XEP-0009
NS_SASL
=
'
urn:ietf:params:xml:ns:xmpp-sasl
'
NS_SEARCH
=
'
jabber:iq:search
'
...
...
This diff is collapsed.
Click to expand it.
src/common/xmpp/roster_nb.py
+
3
−
2
View file @
23f73004
...
...
@@ -38,7 +38,7 @@ class NonBlockingRoster(PlugIn):
internal representation of contacts in roster
"""
def
__init__
(
self
,
version
=
''
):
def
__init__
(
self
,
version
=
None
):
"""
Init internal variables
"""
...
...
@@ -60,7 +60,8 @@ class NonBlockingRoster(PlugIn):
return
iq
=
Iq
(
'
get
'
,
NS_ROSTER
)
iq
.
setTagAttr
(
'
query
'
,
'
ver
'
,
self
.
version
)
if
self
.
version
is
not
None
:
iq
.
setTagAttr
(
'
query
'
,
'
ver
'
,
self
.
version
)
id_
=
self
.
_owner
.
getAnID
()
iq
.
setID
(
id_
)
self
.
_owner
.
send
(
iq
)
...
...
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