Swiftdiff options
| author | Richard Maudsley <richard.maudsley@isode.com> | 2014-05-08 12:00:15 (GMT) |
|---|---|---|
| committer | Richard Maudsley <richard.maudsley@isode.com> | 2014-05-09 10:28:01 (GMT) |
| commit | afa4aa4a38991fc219d71604baab4d64a2082629 (patch) | |
| tree | eaa97acd2e0dd0913bfaca2c06d8a732c9905f7b | |
| parent | 6db4b8979b4a7ca72305266a464c571fb648358b (diff) | |
| download | swift-contrib-afa4aa4a38991fc219d71604baab4d64a2082629.zip swift-contrib-afa4aa4a38991fc219d71604baab4d64a2082629.tar.bz2 | |
Fix MAM Sluift.
Change-Id: I75e87e9c1a0f12f6c56dcb63f0a06f715277b99b
| -rw-r--r-- | Sluift/LuaElementConvertors.cpp | 6 | ||||
| -rw-r--r-- | Sluift/client.cpp | 2 |
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 @@ -46,29 +46,29 @@ LuaElementConvertors::LuaElementConvertors() { convertors.push_back(boost::make_shared<CommandConvertor>(this)); convertors.push_back(boost::make_shared<PubSubEventConvertor>(this)); convertors.push_back(boost::make_shared<BodyConvertor>()); convertors.push_back(boost::make_shared<VCardConvertor>()); convertors.push_back(boost::make_shared<VCardUpdateConvertor>()); convertors.push_back(boost::make_shared<FormConvertor>()); 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)); convertors.push_back(boost::make_shared<ResultSetConvertor>(this)); convertors.push_back(boost::make_shared<ForwardedConvertor>(this)); 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() { } #include <Sluift/ElementConvertors/ElementConvertors.ipp> boost::shared_ptr<Element> LuaElementConvertors::convertFromLua(lua_State* L, int index) { if (lua_isstring(L, index)) { diff --git a/Sluift/client.cpp b/Sluift/client.cpp index 06df6a4..1cdd8d7 100644 --- a/Sluift/client.cpp +++ b/Sluift/client.cpp @@ -467,19 +467,19 @@ SLUIFT_LUA_FUNCTION_WITH_HELP( throw Lua::Exception("Missing MAMQuery"); } if (boost::shared_ptr<MAMQuery> mamQuery = boost::dynamic_pointer_cast<MAMQuery>(Sluift::globals.elementConvertor.convertFromLuaUntyped(L, 2, "mam_query"))) { IQRouter *router = getClient(L)->getClient()->getIQRouter(); JID jid; lua_getfield(L, 2, "jid"); 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"); } return 0; } static void pushEvent(lua_State* L, const SluiftClient::Event& event) { switch (event.type) { |