aboutsummaryrefslogtreecommitdiff
path: root/src/base/QXmppMessage.cpp
diff options
context:
space:
mode:
authorZam-mbpr <love8879201@gmail.com>2015-05-15 13:55:23 +0800
committerZam-mbpr <love8879201@gmail.com>2015-05-15 13:55:23 +0800
commit596c6e8447a0fc69bd1669aaeb4f05ac4f0242f7 (patch)
tree602b3b0050276274e152539842895c0ad68e0e24 /src/base/QXmppMessage.cpp
parente59defd97d3f35e772a3382649b057862035ca45 (diff)
downloadqxmpp-596c6e8447a0fc69bd1669aaeb4f05ac4f0242f7.tar.gz
use XEP-0203 instead of XEP-0091, if there have XEP-0203.
Diffstat (limited to 'src/base/QXmppMessage.cpp')
-rw-r--r--src/base/QXmppMessage.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/base/QXmppMessage.cpp b/src/base/QXmppMessage.cpp
index 43675d9b..600fe47c 100644
--- a/src/base/QXmppMessage.cpp
+++ b/src/base/QXmppMessage.cpp
@@ -501,15 +501,6 @@ void QXmppMessage::parse(const QDomElement &element)
}
d->receiptRequested = element.firstChildElement("request").namespaceURI() == ns_message_receipts;
- // XEP-0203: Delayed Delivery
- QDomElement delayElement = element.firstChildElement("delay");
- if (!delayElement.isNull() && delayElement.namespaceURI() == ns_delayed_delivery)
- {
- const QString str = delayElement.attribute("stamp");
- d->stamp = QXmppUtils::datetimeFromString(str);
- d->stampType = DelayedDelivery;
- }
-
// XEP-0224: Attention
d->attentionRequested = element.firstChildElement("attention").namespaceURI() == ns_attention;
@@ -575,6 +566,15 @@ void QXmppMessage::parse(const QDomElement &element)
xElement = xElement.nextSiblingElement();
}
setExtensions(extensions);
+
+ // XEP-0203: Delayed Delivery
+ QDomElement delayElement = element.firstChildElement("delay");
+ if (!delayElement.isNull() && delayElement.namespaceURI() == ns_delayed_delivery)
+ {
+ const QString str = delayElement.attribute("stamp");
+ d->stamp = QXmppUtils::datetimeFromString(str);
+ d->stampType = DelayedDelivery;
+ }
}
void QXmppMessage::toXml(QXmlStreamWriter *xmlWriter) const