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

fix bug: use jid without resource

This commit is contained in:
Zhenchao Li 2010-07-05 19:54:59 +08:00
parent fbc4144c82
commit 92988cf2ba
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/jingle_ft.py
View File

@ -132,7 +132,8 @@ class JingleFileTransfer(JingleContent):
def __on_transport_info(self, stanza, content, error, action):
log.info("__on_transport_info")
gajim.socks5queue.send_file(self.file_props, self.session.ourjid)
jid = gajim.get_jid_without_resource(self.session.ourjid)
gajim.socks5queue.send_file(self.file_props, jid)
def __on_iq_result(self, stanza, content, error, action):
log.info("__on_iq_result")
@ -155,7 +156,8 @@ class JingleFileTransfer(JingleContent):
else: # session-accept iq-result
if not gajim.socks5queue.get_file_props(self.session.ourjid, self.file_props['sid']):
gajim.socks5queue.add_file_props(self.session.ourjid, self.file_props)
gajim.socks5queue.connect_to_hosts(self.session.ourjid, self.file_props['sid'],
jid = gajim.get_jid_without_resource(self.session.ourjid)
gajim.socks5queue.connect_to_hosts(jid, self.file_props['sid'],
self.send_candidate_used, self._on_connect_error)
def send_candidate_used(self, streamhost):

3
src/common/protocol/bytestream.py
View File

@ -138,7 +138,8 @@ class ConnectionBytestream:
jid = gajim.get_jid_without_resource(file_props['sender'])
resource = gajim.get_resource_from_jid(file_props['sender'])
sid = file_props['sid']
gajim.socks5queue.add_file_props(session.ourjid, file_props)
wr_ourjid = gajim.get_jid_without_resource(session.ourjid)
gajim.socks5queue.add_file_props(wr_ourjid, file_props)
if not session.accepted:
session.approve_session()