changeset a180b4e9890c in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=a180b4e9890c description: fix getting info of file when receiving a file request
diffstat:
src/common/connection_handlers_events.py | 5 ++++- src/common/jingle.py | 4 +--- src/common/jingle_session.py | 5 ++++- 3 files changed, 9 insertions(+), 5 deletions(-)
diffs (62 lines):
diff -r c7a32812c477 -r a180b4e9890c src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Oct 08 11:14:47 2012 +0200 +++ b/src/common/connection_handlers_events.py Tue Oct 09 22:48:01 2012 -0400 @@ -2001,9 +2001,12 @@ else: file_tag = desc.getTag('request').getTag('file') h = file_tag.getTag('hash') + h = h.getData() if h else None n = file_tag.getTag('name') + n = n.getData() if n else None pjid = gajim.get_jid_without_resource(self.fjid) - file_info = self.conn.get_file_info(pjid, hash_=h, name=n) + file_info = self.conn.get_file_info(pjid, hash_=h, + name=n,account=self.conn.name) self.file_props.file_name = file_info['file-name'] self.file_props.sender = self.conn._ft_get_our_jid() self.file_props.receiver = self.fjid diff -r c7a32812c477 -r a180b4e9890c src/common/jingle.py --- a/src/common/jingle.py Mon Oct 08 11:14:47 2012 +0200 +++ b/src/common/jingle.py Tue Oct 09 22:48:01 2012 -0400 @@ -161,7 +161,6 @@ return c.transport.sid
def __hash_support(self, contact): - if contact.supports(xmpp.NS_HASHES): if contact.supports(xmpp.NS_HASHES_MD5): return 'md5' @@ -171,7 +170,6 @@ return 'sha-256' elif contact.supports(xmpp.NS_HASHES_SHA512): return 'sha-512' - return None
def iter_jingle_sessions(self, jid, sid=None, media=None): @@ -194,7 +192,7 @@ # to be requested again. self.files.append(file_)
- def get_file_info(self, peerjid, hash_=None, name=None): + def get_file_info(self, peerjid, hash_=None, name=None, account=None): if hash_: for f in self.files: # DEBUG #if f['hash'] == '1294809248109223': diff -r c7a32812c477 -r a180b4e9890c src/common/jingle_session.py --- a/src/common/jingle_session.py Mon Oct 08 11:14:47 2012 +0200 +++ b/src/common/jingle_session.py Tue Oct 09 22:48:01 2012 -0400 @@ -520,9 +520,12 @@ if request: self.request = True h = request.getTag('file').getTag('hash') + h = h.getData() if h else None n = request.getTag('file').getTag('name') + n = n.getData() if n else None pjid = gajim.get_jid_without_resource(self.peerjid) - file_info = self.connection.get_file_info(pjid, h, n) + file_info = self.connection.get_file_info(pjid, h, n, + self.connection.name) if not file_info: log.warning('The peer ' + pjid + \ ' is requesting a ' + \