From 311778c569f2f97c4b99d2c8afea81dbc368dcc7 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Mon, 3 Sep 2012 12:58:12 +0200
Subject: add extended addresses to QXmppMessage and QXmppPresence

---
 src/base/QXmppStanza.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/base/QXmppStanza.cpp')

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
-- 
cgit v1.2.3