aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZam-mbpr <love8879201@gmail.com>2015-05-15 13:55:23 +0800
committerJeremy Lainé <jeremy.laine@m4x.org>2015-06-04 08:05:21 +0200
commit7bdf1406410686a46bbfe95a2f7855a4a6beffdc (patch)
tree57cec73d70e45120ec86fd74c000dff4f0909770
parent7ffc638a468e958167cc929941f7963a8a4bd9a5 (diff)
downloadqxmpp-7bdf1406410686a46bbfe95a2f7855a4a6beffdc.tar.gz
use XEP-0203 instead of XEP-0091, if there have XEP-0203.
-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