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

send content-remove when a filetranfer is finished but other are still running

This commit is contained in:
Yann Leboulanger 2010-08-26 16:56:46 +02:00
parent 5234e42a28
commit ac0e0448b2
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui_interface.py
View File

@ -1417,7 +1417,15 @@ class Interface:
if file_props['session-type'] == 'jingle' and file_props['type'] == 'r': if file_props['session-type'] == 'jingle' and file_props['type'] == 'r':
session = gajim.connections[account].get_jingle_session(jid, session = gajim.connections[account].get_jingle_session(jid,
sid=file_props['session-sid']) sid=file_props['session-sid'])
session.end_session() # get content:
content = None
for c in session.contents.values():
if c.file_props['sid'] == file_props['sid']:
content = c
break
if not content:
return
session.remove_content('initiator', c.name)
if helpers.allow_popup_window(account): if helpers.allow_popup_window(account):
if file_props['error'] == 0: if file_props['error'] == 0:
@ -1484,12 +1492,6 @@ class Interface:
txt = _('File transfer of %(filename)s to %(name)s ' txt = _('File transfer of %(filename)s to %(name)s '
'stopped.') % {'filename': filename, 'name': name} 'stopped.') % {'filename': filename, 'name': name}
img_name = 'gajim-ft_stopped' img_name = 'gajim-ft_stopped'
# if we are the sender of the file and the file transfer was initiated with jingle
# send session-terminate stanza
if 'session-type' in file_props and file_props['session-type'] == 'jingle':
sender = gajim.get_jid_without_resource(file_props['sender'])
jingle_session = gajim.connections[account].get_jingle_session(sender, file_props['sid'])
jingle_session.end_session()
path = gtkgui_helpers.get_icon_path(img_name, 48) path = gtkgui_helpers.get_icon_path(img_name, 48)
else: else:
txt = '' txt = ''