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
Weblate
gajim
Commits
ac2b2ac3
Commit
ac2b2ac3
authored
14 years ago
by
Yann Leboulanger
Browse files
Options
Downloads
Patches
Plain Diff
accept session as soon as one content is accepted
parent
99981e57
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/common/jingle_ft.py
+2
-0
2 additions, 0 deletions
src/common/jingle_ft.py
src/common/jingle_session.py
+5
-1
5 additions, 1 deletion
src/common/jingle_session.py
with
7 additions
and
1 deletion
src/common/jingle_ft.py
+
2
−
0
View file @
ac2b2ac3
...
...
@@ -223,6 +223,8 @@ class JingleFileTransfer(JingleContent):
# send error message, notify the user
elif
not
self
.
weinitiate
and
self
.
state
==
STATE_NOT_STARTED
:
# session-accept iq-result
if
not
self
.
sent
:
return
self
.
state
=
STATE_ACCEPTED
if
not
gajim
.
socks5queue
.
get_file_props
(
self
.
session
.
connection
.
name
,
self
.
file_props
[
'
sid
'
]):
...
...
This diff is collapsed.
Click to expand it.
src/common/jingle_session.py
+
5
−
1
View file @
ac2b2ac3
...
...
@@ -247,6 +247,9 @@ class JingleSession(object):
"""
Return True when all codecs and candidates are ready (for all contents)
"""
for
c
in
self
.
contents
.
itervalues
():
if
c
.
is_ready
():
return
True
return
(
all
((
content
.
is_ready
()
for
content
in
self
.
contents
.
itervalues
()))
and
self
.
accepted
)
...
...
@@ -623,7 +626,8 @@ class JingleSession(object):
# TODO: integrate with __appendContent?
# TODO: parameters 'name', 'content'?
for
content
in
self
.
contents
.
values
():
self
.
__append_content
(
jingle
,
content
)
if
content
.
is_ready
():
self
.
__append_content
(
jingle
,
content
)
def
__session_initiate
(
self
):
assert
self
.
state
==
JingleStates
.
ended
...
...
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