changeset 775d1e8fa6bd in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=775d1e8fa6bd
description: correctly send hash in session-accept
diffstat:
src/common/jingle_content.py | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diffs (29 lines):
diff -r 7255a0ce52e2 -r 775d1e8fa6bd src/common/jingle_content.py
--- a/src/common/jingle_content.py Wed Aug 29 12:21:53 2012 +0200
+++ b/src/common/jingle_content.py Wed Aug 29 16:12:14 2012 +0200
@@ -180,14 +180,17 @@
node = xmpp.simplexml.Node(tag='size')
node.addData(self.file_props.size)
file_tag.addChild(node=node)
- if self.file_props.hash_:
- # TODO: use xep-300 for this bit
- pass
- # if the file is less than 10 mb, then it is small
- # lets calculate it right away
- if int(self.file_props.size) < 10000000:
- h = self._calcHash()
- file_tag.addChild(node=h)
+ if self.file_props.type_ == 'r':
+ if self.file_props.hash_:
+ h = file_tag.addChild('hash', attrs={
+ 'algo': self.file_props.algo}, namespace=xmpp.NS_HASHES,
+ payload=self.file_props.hash_)
+ else:
+ # if the file is less than 10 mb, then it is small
+ # lets calculate it right away
+ if int(self.file_props.size) < 10000000:
+ h = self._calcHash()
+ file_tag.addChild(node=h)
desc = file_tag.setTag('desc')
if self.file_props.desc:
desc.setData(self.file_props.desc)