aboutsummaryrefslogtreecommitdiff
path: root/src/base/QXmppMessage.cpp
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2012-09-03 12:51:55 +0200
committerJeremy Lainé <jeremy.laine@m4x.org>2012-09-03 12:51:55 +0200
commit7dff3ee250cfea98be51843b3f4be1f8f909540f (patch)
tree51d07e7af1cd05bc6701969a1c2b6ac392e58f15 /src/base/QXmppMessage.cpp
parent18a9380db083a9b4d195a337b87b7b3c142d28e9 (diff)
revert previous commit
Diffstat (limited to 'src/base/QXmppMessage.cpp')
-rw-r--r--src/base/QXmppMessage.cpp7
1 files changed, 5 insertions, 2 deletions
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)