changeset 919d1c16d62a in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=919d1c16d62a description: fix incorrect use of jid where account name should be used as parameter

diffstat:

src/common/jingle_ft.py | 12 +++++------- src/common/protocol/bytestream.py | 3 +-- src/gui_interface.py | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-)

diffs (58 lines):

diff -r 1b2d593e102a -r 919d1c16d62a src/common/jingle_ft.py --- a/src/common/jingle_ft.py Thu Jul 15 13:38:53 2010 +0800 +++ b/src/common/jingle_ft.py Thu Jul 15 14:32:34 2010 +0800 @@ -169,13 +169,12 @@ self.file_props['is_a_proxy'] = True receiver = Socks5Receiver(gajim.idlequeue, streamhost_used, self.file_props['sid'], self.file_props) - #gajim.socks5queue.add_file_props(self.session.ourjid, self.file_props) - gajim.socks5queue.add_receiver(self.session.ourjid, receiver) + gajim.socks5queue.add_receiver(self.session.connection.name, receiver) streamhost_used['idx'] = receiver.queue_idx gajim.socks5queue.on_success = self.transport._on_proxy_auth_ok else: 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): log.info("__on_iq_result") @@ -199,10 +198,9 @@ # send error message, notify the user elif not self.weinitiate and self.state == STATE_NOT_STARTED: # session-accept iq-result self.state = STATE_ACCEPTED - 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) - jid = gajim.get_jid_without_resource(self.session.ourjid) - gajim.socks5queue.connect_to_hosts(jid, 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.connection.name, self.file_props) + gajim.socks5queue.connect_to_hosts(self.session.connection.name, self.file_props['sid'], self.send_candidate_used, self._on_connect_error) elif not self.weinitiate and self.state == STATE_ACCEPTED: # transport-info iq-result self.state = STATE_TRANSPORT_INFO diff -r 1b2d593e102a -r 919d1c16d62a src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Thu Jul 15 13:38:53 2010 +0800 +++ b/src/common/protocol/bytestream.py Thu Jul 15 14:32:34 2010 +0800 @@ -138,8 +138,7 @@ jid = gajim.get_jid_without_resource(file_props['sender']) resource = gajim.get_resource_from_jid(file_props['sender']) sid = file_props['sid'] - wr_ourjid = gajim.get_jid_without_resource(session.ourjid) - gajim.socks5queue.add_file_props(wr_ourjid, file_props) + gajim.socks5queue.add_file_props(self.name, file_props)

if not session.accepted: session.approve_session() diff -r 1b2d593e102a -r 919d1c16d62a src/gui_interface.py --- a/src/gui_interface.py Thu Jul 15 13:38:53 2010 +0800 +++ b/src/gui_interface.py Thu Jul 15 14:32:34 2010 +0800 @@ -1510,7 +1510,7 @@ # 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[sender].get_jingle_session(sender, file_props['sid']) + 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) else: