From 7dff3ee250cfea98be51843b3f4be1f8f909540f Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Mon, 3 Sep 2012 12:51:55 +0200 Subject: revert previous commit --- src/base/QXmppMessage.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/base/QXmppMessage.cpp') diff --git a/src/base/QXmppMessage.cpp b/src/base/QXmppMessage.cpp index 86e808d2..d47233b9 100644 --- a/src/base/QXmppMessage.cpp +++ b/src/base/QXmppMessage.cpp @@ -382,8 +382,10 @@ void QXmppMessage::parse(const QDomElement &element) void QXmppMessage::toXml(QXmlStreamWriter *xmlWriter) const { xmlWriter->writeStartElement("message"); - QXmppStanza::toXmlElementFromChild(xmlWriter); - + helperToXmlAddAttribute(xmlWriter, "xml:lang", lang()); + helperToXmlAddAttribute(xmlWriter, "id", id()); + helperToXmlAddAttribute(xmlWriter, "to", to()); + helperToXmlAddAttribute(xmlWriter, "from", from()); helperToXmlAddAttribute(xmlWriter, "type", message_types[d->type]); if (!d->subject.isEmpty()) helperToXmlAddTextElement(xmlWriter, "subject", d->subject); @@ -391,6 +393,7 @@ void QXmppMessage::toXml(QXmlStreamWriter *xmlWriter) const helperToXmlAddTextElement(xmlWriter, "body", d->body); if (!d->thread.isEmpty()) helperToXmlAddTextElement(xmlWriter, "thread", d->thread); + error().toXml(xmlWriter); // chat states if (d->state > None && d->state <= Paused) -- cgit v1.2.3