changeset d0ce81321fa1 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=d0ce81321fa1
description: dont use content-remove for FT use session-terminate
diffstat:
src/gui_interface.py | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diffs (26 lines):
diff -r 7a9de4d181e1 -r d0ce81321fa1 src/gui_interface.py
--- a/src/gui_interface.py Thu Dec 29 14:08:35 2011 +0100
+++ b/src/gui_interface.py Thu Dec 29 17:22:51 2011 -0500
@@ -927,19 +927,10 @@
jid = unicode(file_props['receiver'])
gajim.socks5queue.remove_sender(file_props['sid'], True, True)
# End jingle session
- if file_props.get('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'])
- # 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 session:
+ session.end_session()
if helpers.allow_popup_window(account):
if file_props['error'] == 0:
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
