add extended addresses to QXmppMessage and QXmppPresence

1 files changed, 5 insertions, 8 deletions

diff --git a/src/base/QXmppStanza.cpp b/src/base/QXmppStanza.cpp
index f73010ee..4a02b6c2 100644
--- a/src/base/QXmppStanza.cpp
+++ b/src/base/QXmppStanza.cpp
@@ -606,15 +606,8 @@ void QXmppStanza::parse(const QDomElement &element)
     }
 }
 
-void QXmppStanza::toXmlElementFromChild(QXmlStreamWriter *xmlWriter) const
+void QXmppStanza::extensionsToXml(QXmlStreamWriter *xmlWriter) const
 {
-    helperToXmlAddAttribute(xmlWriter, "xml:lang", d->lang);
-    helperToXmlAddAttribute(xmlWriter, "id", d->id);
-    helperToXmlAddAttribute(xmlWriter, "to", d->to);
-    helperToXmlAddAttribute(xmlWriter, "from", d->from);
-
-    d->error.toXml(xmlWriter);
-
     // XEP-0033: Extended Stanza Addressing
     if (!d->extendedAddresses.isEmpty()) {
         xmlWriter->writeStartElement("addresses");
@@ -623,6 +616,10 @@ void QXmppStanza::toXmlElementFromChild(QXmlStreamWriter *xmlWriter) const
             address.toXml(xmlWriter);
         xmlWriter->writeEndElement();
     }
+
+    // other extensions
+    foreach (const QXmppElement &extension, d->extensions)
+        extension.toXml(xmlWriter);
 }
 
 /// \endcond