Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2012-10-08 21:59:42 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2012-10-08 22:04:15 (GMT) |
| commit | 8f75cf3d9892a3ce2c58537f29c851392231e29c (patch) | |
| tree | 5239ce98c3e24780ba46d328f383c90cb84b35c7 /Swiften/Parser/PayloadParsers/JingleFileTransferReceivedParser.cpp | |
| parent | 53b7a6ad2d12fc5edc6a98726cabf1ea0b496505 (diff) | |
| download | swift-contrib-8f75cf3d9892a3ce2c58537f29c851392231e29c.zip swift-contrib-8f75cf3d9892a3ce2c58537f29c851392231e29c.tar.bz2 | |
Update XEP-0234 implementation to version 0.15 of the standard.tobias/jingle
Diffstat (limited to 'Swiften/Parser/PayloadParsers/JingleFileTransferReceivedParser.cpp')
| -rw-r--r-- | Swiften/Parser/PayloadParsers/JingleFileTransferReceivedParser.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/Swiften/Parser/PayloadParsers/JingleFileTransferReceivedParser.cpp b/Swiften/Parser/PayloadParsers/JingleFileTransferReceivedParser.cpp index ae56981..afe1da1 100644 --- a/Swiften/Parser/PayloadParsers/JingleFileTransferReceivedParser.cpp +++ b/Swiften/Parser/PayloadParsers/JingleFileTransferReceivedParser.cpp @@ -7,8 +7,7 @@ #include <Swiften/Parser/PayloadParsers/JingleFileTransferReceivedParser.h> #include <boost/shared_ptr.hpp> -#include <Swiften/Parser/PayloadParsers/StreamInitiationFileInfoParser.h> -#include <Swiften/Parser/PayloadParsers/StreamInitiationFileInfoParser.h> +#include <Swiften/Parser/PayloadParsers/JingleFileTransferFileInfoParser.h> #include <Swiften/Parser/GenericPayloadParserFactory.h> #include <Swiften/Parser/PayloadParserFactory.h> @@ -19,7 +18,7 @@ JingleFileTransferReceivedParser::JingleFileTransferReceivedParser() : level(0) void JingleFileTransferReceivedParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) { if (level == 1 && element == "file") { - PayloadParserFactory* payloadParserFactory = new GenericPayloadParserFactory<StreamInitiationFileInfoParser>("file", "http://jabber.org/protocol/si/profile/file-transfer"); + PayloadParserFactory* payloadParserFactory = new GenericPayloadParserFactory<JingleFileTransferFileInfoParser>("file"); if (payloadParserFactory) { currentPayloadParser.reset(payloadParserFactory->createPayloadParser()); } @@ -32,18 +31,22 @@ void JingleFileTransferReceivedParser::handleStartElement(const std::string& ele ++level; } -void JingleFileTransferReceivedParser::handleEndElement(const std::string& element, const std::string& ) { +void JingleFileTransferReceivedParser::handleEndElement(const std::string& element, const std::string& ns) { --level; if (element == "file") { - boost::shared_ptr<StreamInitiationFileInfo> fileInfo = boost::dynamic_pointer_cast<StreamInitiationFileInfo>(currentPayloadParser->getPayload()); + boost::shared_ptr<JingleFileTransferFileInfo> fileInfo = boost::dynamic_pointer_cast<JingleFileTransferFileInfo>(currentPayloadParser->getPayload()); if (fileInfo) { getPayloadInternal()->setFileInfo(*fileInfo); } + } else { + currentPayloadParser->handleEndElement(element, ns); } } -void JingleFileTransferReceivedParser::handleCharacterData(const std::string& ) { - +void JingleFileTransferReceivedParser::handleCharacterData(const std::string &data) { + if (currentPayloadParser && level >= 1) { + currentPayloadParser->handleCharacterData(data); + } } } |