Update to XEP-0300 version 0.5 (:2 namespace).

6 files changed, 8 insertions, 8 deletions

diff --git a/src/common/gajim.py b/src/common/gajim.py
index fc7fc323b..9726c4064 100644
--- a/src/common/gajim.py
+++ b/src/common/gajim.py
@@ -253,7 +253,7 @@ gajim_common_features = [nbxmpp.NS_BYTESTREAM, nbxmpp.NS_SI, nbxmpp.NS_FILE,
     nbxmpp.NS_REGISTER, nbxmpp.NS_VERSION, nbxmpp.NS_DATA, nbxmpp.NS_ENCRYPTED,
     'msglog', 'sslc2s', 'stringprep', nbxmpp.NS_PING, nbxmpp.NS_TIME_REVISED,
     nbxmpp.NS_SSN, nbxmpp.NS_MOOD, nbxmpp.NS_ACTIVITY, nbxmpp.NS_NICK,
-    nbxmpp.NS_ROSTERX, nbxmpp.NS_SECLABEL, nbxmpp.NS_HASHES,
+    nbxmpp.NS_ROSTERX, nbxmpp.NS_SECLABEL, nbxmpp.NS_HASHES_2,
     nbxmpp.NS_HASHES_MD5, nbxmpp.NS_HASHES_SHA1, nbxmpp.NS_HASHES_SHA256,
     nbxmpp.NS_HASHES_SHA512, nbxmpp.NS_CONFERENCE]
 
diff --git a/src/common/jingle.py b/src/common/jingle.py
index 93f6b1011..6903679b9 100644
--- a/src/common/jingle.py
+++ b/src/common/jingle.py
@@ -172,7 +172,7 @@ class ConnectionJingle(object):
         return c.transport.sid
 
     def __hash_support(self, contact):
-        if contact.supports(nbxmpp.NS_HASHES):
+        if contact.supports(nbxmpp.NS_HASHES_2):
             if contact.supports(nbxmpp.NS_HASHES_BLAKE2B_512):
                 return 'blake2b-512'
             elif contact.supports(nbxmpp.NS_HASHES_BLAKE2B_256):
diff --git a/src/common/jingle_content.py b/src/common/jingle_content.py
index 0bba140ef..9d82c821f 100644
--- a/src/common/jingle_content.py
+++ b/src/common/jingle_content.py
@@ -192,7 +192,7 @@ class JingleContent:
         if self.file_props.type_ == 'r':
             if self.file_props.hash_:
                 file_tag.addChild('hash', attrs={'algo': self.file_props.algo},
-                                  namespace=nbxmpp.NS_HASHES,
+                                  namespace=nbxmpp.NS_HASHES_2,
                                   payload=self.file_props.hash_)
         else:
             # if the file is less than 10 mb, then it is small
diff --git a/src/common/jingle_ft.py b/src/common/jingle_ft.py
index 35ffe0f40..1aa4a431a 100644
--- a/src/common/jingle_ft.py
+++ b/src/common/jingle_ft.py
@@ -176,7 +176,7 @@ class JingleFileTransfer(JingleContent):
         except IOError:
             # can't open file
             return
-        h = nbxmpp.Hashes()
+        h = nbxmpp.Hashes2()
         hash_ = h.calculateHash(self.file_props.algo, file_)
         file_.close()
         # DEBUG
diff --git a/src/common/jingle_session.py b/src/common/jingle_session.py
index 79d724ffb..371baf56c 100644
--- a/src/common/jingle_session.py
+++ b/src/common/jingle_session.py
@@ -444,9 +444,9 @@ class JingleSession:
         for child in payload:
             if child.getName() == 'checksum':
                 hash_ = child.getTag('file').getTag(name='hash',
-                                                    namespace=nbxmpp.NS_HASHES)
+                                                    namespace=nbxmpp.NS_HASHES_2)
                 algo = hash_.getAttr('algo')
-                if algo in nbxmpp.Hashes.supported:
+                if algo in nbxmpp.Hashes2.supported:
                     file_props = FilesProp.getFileProp(self.connection.name,
                                                        self.sid)
                     file_props.algo = algo
diff --git a/src/gui_interface.py b/src/gui_interface.py
index c2e420817..ebfc4cfe4 100644
--- a/src/gui_interface.py
+++ b/src/gui_interface.py
@@ -73,7 +73,7 @@ from session import ChatControlSession
 from common import sleepy
 
 from nbxmpp import idlequeue
-from nbxmpp import Hashes
+from nbxmpp import Hashes2
 from common.zeroconf import connection_zeroconf
 from common import resolver
 from common import caps_cache
@@ -988,7 +988,7 @@ class Interface:
         session = gajim.connections[account].get_jingle_session(jid=None,
             sid=file_props.sid)
         ft_win = self.instances['file_transfers']
-        h = Hashes()
+        h = Hashes2()
         try:
             file_ = open(file_props.file_name, 'rb')
         except: