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

Merge branch 'jingleft' of https://dev.gajim.org/linkmauve/gajim into HEAD

Browse source
This commit is contained in:
Yann Leboulanger 2017-06-14 22:32:21 +02:00
commit 5606e5b9a2
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/jingle_ft.py
View file

@ -176,7 +176,7 @@ class JingleFileTransfer(JingleContent):
except IOError: except IOError:
# can't open file # can't open file
return return
h = nbxmpp.Hashes() h = nbxmpp.Hashes2()
hash_ = h.calculateHash(self.file_props.algo, file_) hash_ = h.calculateHash(self.file_props.algo, file_)
file_.close() file_.close()
# DEBUG # DEBUG

2
src/common/jingle_session.py
View file

@ -446,7 +446,7 @@ class JingleSession:
hash_ = child.getTag('file').getTag(name='hash', hash_ = child.getTag('file').getTag(name='hash',
namespace=nbxmpp.NS_HASHES_2) namespace=nbxmpp.NS_HASHES_2)
algo = hash_.getAttr('algo') algo = hash_.getAttr('algo')
if algo in nbxmpp.Hashes.supported: if algo in nbxmpp.Hashes2.supported:
file_props = FilesProp.getFileProp(self.connection.name, file_props = FilesProp.getFileProp(self.connection.name,
self.sid) self.sid)
file_props.algo = algo file_props.algo = algo

4
src/gui_interface.py
View file

@ -73,7 +73,7 @@ from session import ChatControlSession
from common import sleepy from common import sleepy
from nbxmpp import idlequeue from nbxmpp import idlequeue
from nbxmpp import Hashes from nbxmpp import Hashes2
from common.zeroconf import connection_zeroconf from common.zeroconf import connection_zeroconf
from common import resolver from common import resolver
from common import caps_cache from common import caps_cache
@ -988,7 +988,7 @@ class Interface:
session = gajim.connections[account].get_jingle_session(jid=None, session = gajim.connections[account].get_jingle_session(jid=None,
sid=file_props.sid) sid=file_props.sid)
ft_win = self.instances['file_transfers'] ft_win = self.instances['file_transfers']
h = Hashes() h = Hashes2()
try: try:
file_ = open(file_props.file_name, 'rb') file_ = open(file_props.file_name, 'rb')
except: except: