diff sat/core/xmpp.py @ 3573:813595f88612

merge changes from main branch
author Goffi <goffi@goffi.org>
date Thu, 17 Jun 2021 13:05:58 +0200
parents 888109774673 01c23359b915
children 31628770a15a
line wrap: on
line diff
--- a/sat/core/xmpp.py	Thu Jun 03 15:21:43 2021 +0200
+++ b/sat/core/xmpp.py	Thu Jun 17 13:05:58 2021 +0200
@@ -247,7 +247,7 @@
             entity.fallBack = SatFallbackHandler(host)
             entity.fallBack.setHandlerParent(entity)
 
-            entity.versionHandler = SatVersionHandler(C.APP_NAME_FULL, host.full_version)
+            entity.versionHandler = SatVersionHandler(C.APP_NAME, host.full_version)
             entity.versionHandler.setHandlerParent(entity)
 
             entity.identityHandler = SatIdentityHandler()
@@ -691,6 +691,7 @@
 
         pre_xml_treatments.addCallback(lambda __: self.generateMessageXML(data, post_xml_treatments))
         pre_xml_treatments.addCallback(lambda __: post_xml_treatments)
+        pre_xml_treatments.addErrback(self._cancelErrorTrap)
         post_xml_treatments.addCallback(lambda __: self.sendMessageData(data))
         if send_only:
             log.debug(_("Triggers, storage and echo have been inhibited by the "