summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Maudsley <richard.maudsley@isode.com>2014-05-08 12:00:15 (GMT)
committerRichard Maudsley <richard.maudsley@isode.com>2014-05-09 10:28:01 (GMT)
commitafa4aa4a38991fc219d71604baab4d64a2082629 (patch)
treeeaa97acd2e0dd0913bfaca2c06d8a732c9905f7b
parent6db4b8979b4a7ca72305266a464c571fb648358b (diff)
downloadswift-afa4aa4a38991fc219d71604baab4d64a2082629.zip
swift-afa4aa4a38991fc219d71604baab4d64a2082629.tar.bz2
Fix MAM Sluift.
Change-Id: I75e87e9c1a0f12f6c56dcb63f0a06f715277b99b
-rw-r--r--Sluift/LuaElementConvertors.cpp6
-rw-r--r--Sluift/client.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/Sluift/LuaElementConvertors.cpp b/Sluift/LuaElementConvertors.cpp
index a5d0b0a..9ca932e 100644
--- a/Sluift/LuaElementConvertors.cpp
+++ b/Sluift/LuaElementConvertors.cpp
@@ -52,9 +52,6 @@ LuaElementConvertors::LuaElementConvertors() {
convertors.push_back(boost::make_shared<SoftwareVersionConvertor>());
convertors.push_back(boost::make_shared<DiscoInfoConvertor>());
convertors.push_back(boost::make_shared<DiscoItemsConvertor>());
- convertors.push_back(boost::make_shared<DOMElementConvertor>());
- convertors.push_back(boost::make_shared<RawXMLElementConvertor>());
- convertors.push_back(boost::make_shared<DefaultElementConvertor>());
convertors.push_back(boost::make_shared<IQConvertor>(this));
convertors.push_back(boost::make_shared<PresenceConvertor>(this));
convertors.push_back(boost::make_shared<MessageConvertor>(this));
@@ -63,6 +60,9 @@ LuaElementConvertors::LuaElementConvertors() {
convertors.push_back(boost::make_shared<MAMResultConvertor>(this));
convertors.push_back(boost::make_shared<MAMQueryConvertor>(this));
convertors.push_back(boost::make_shared<MAMArchivedConvertor>(this));
+ convertors.push_back(boost::make_shared<DOMElementConvertor>());
+ convertors.push_back(boost::make_shared<RawXMLElementConvertor>());
+ convertors.push_back(boost::make_shared<DefaultElementConvertor>());
}
LuaElementConvertors::~LuaElementConvertors() {
diff --git a/Sluift/client.cpp b/Sluift/client.cpp
index 06df6a4..1cdd8d7 100644
--- a/Sluift/client.cpp
+++ b/Sluift/client.cpp
@@ -473,7 +473,7 @@ SLUIFT_LUA_FUNCTION_WITH_HELP(
if (!lua_isnil(L, -1)) {
jid = JID(lua_tostring(L, -1));
}
- router->sendIQ(IQ::createRequest(IQ::Get, jid, IDGenerator().generateID(), mamQuery));
+ router->sendIQ(IQ::createRequest(IQ::Set, jid, IDGenerator().generateID(), mamQuery));
}
else {
throw Lua::Exception("Illegal MAMQuery");