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

fix incorrect use of jid where account name should be used as parameter

This commit is contained in:
Zhenchao Li 2010-07-15 14:32:34 +08:00
parent 7d0029879a
commit e75dc0c408
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/jingle_ft.py
View File

@ -169,13 +169,12 @@ class JingleFileTransfer(JingleContent):
self.file_props['is_a_proxy'] = True self.file_props['is_a_proxy'] = True
receiver = Socks5Receiver(gajim.idlequeue, streamhost_used, receiver = Socks5Receiver(gajim.idlequeue, streamhost_used,
self.file_props['sid'], self.file_props) self.file_props['sid'], self.file_props)
#gajim.socks5queue.add_file_props(self.session.ourjid, self.file_props) gajim.socks5queue.add_receiver(self.session.connection.name, receiver)
gajim.socks5queue.add_receiver(self.session.ourjid, receiver)
streamhost_used['idx'] = receiver.queue_idx streamhost_used['idx'] = receiver.queue_idx
gajim.socks5queue.on_success = self.transport._on_proxy_auth_ok gajim.socks5queue.on_success = self.transport._on_proxy_auth_ok
else: else:
jid = gajim.get_jid_without_resource(self.session.ourjid) jid = gajim.get_jid_without_resource(self.session.ourjid)
gajim.socks5queue.send_file(self.file_props, jid) gajim.socks5queue.send_file(self.file_props, self.session.connection.name)
def __on_iq_result(self, stanza, content, error, action): def __on_iq_result(self, stanza, content, error, action):
log.info("__on_iq_result") log.info("__on_iq_result")
@ -199,10 +198,9 @@ class JingleFileTransfer(JingleContent):
# send error message, notify the user # send error message, notify the user
elif not self.weinitiate and self.state == STATE_NOT_STARTED: # session-accept iq-result elif not self.weinitiate and self.state == STATE_NOT_STARTED: # session-accept iq-result
self.state = STATE_ACCEPTED self.state = STATE_ACCEPTED
if not gajim.socks5queue.get_file_props(self.session.ourjid, self.file_props['sid']): if not gajim.socks5queue.get_file_props(self.session.connection.name, self.file_props['sid']):
gajim.socks5queue.add_file_props(self.session.ourjid, self.file_props) gajim.socks5queue.add_file_props(self.session.connection.name, self.file_props)
jid = gajim.get_jid_without_resource(self.session.ourjid) gajim.socks5queue.connect_to_hosts(self.session.connection.name, self.file_props['sid'],
gajim.socks5queue.connect_to_hosts(jid, self.file_props['sid'],
self.send_candidate_used, self._on_connect_error) self.send_candidate_used, self._on_connect_error)
elif not self.weinitiate and self.state == STATE_ACCEPTED: # transport-info iq-result elif not self.weinitiate and self.state == STATE_ACCEPTED: # transport-info iq-result
self.state = STATE_TRANSPORT_INFO self.state = STATE_TRANSPORT_INFO

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

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

2
src/gui_interface.py
View File

@ -1510,7 +1510,7 @@ class Interface:
# send session-terminate stanza # send session-terminate stanza
if 'session-type' in file_props and file_props['session-type'] == 'jingle': if 'session-type' in file_props and file_props['session-type'] == 'jingle':
sender = gajim.get_jid_without_resource(file_props['sender']) sender = gajim.get_jid_without_resource(file_props['sender'])
jingle_session = gajim.connections[sender].get_jingle_session(sender, file_props['sid']) jingle_session = gajim.connections[account].get_jingle_session(sender, file_props['sid'])
jingle_session.end_session() jingle_session.end_session()
path = gtkgui_helpers.get_icon_path(img_name, 48) path = gtkgui_helpers.get_icon_path(img_name, 48)
else: else: