Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-02-04 13:56:42 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2015-02-09 14:09:18 (GMT) |
| commit | ef319397be8439482fdf95f46a29643d15980b37 (patch) | |
| tree | 01b1b70cedccbbc7f5dde7d72939c3cfeeee1784 /Swiften/Parser/PayloadParsers/JingleParser.cpp | |
| parent | 7d3df55bf5fd93b3eaca36cc43cb22ea7879bf7e (diff) | |
| download | swift-ef319397be8439482fdf95f46a29643d15980b37.zip swift-ef319397be8439482fdf95f46a29643d15980b37.tar.bz2 | |
Update DiscoInfo string for Jingle file-transfer to :4 and remove obsolete files
Test-Information:
Unit tests run successful on OS X 10.9.5
Change-Id: I9df0c798723f79df85cfc7301aed0a7ad6309904
Diffstat (limited to 'Swiften/Parser/PayloadParsers/JingleParser.cpp')
| -rw-r--r-- | Swiften/Parser/PayloadParsers/JingleParser.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Swiften/Parser/PayloadParsers/JingleParser.cpp b/Swiften/Parser/PayloadParsers/JingleParser.cpp index dd34458..7041a92 100644 --- a/Swiften/Parser/PayloadParsers/JingleParser.cpp +++ b/Swiften/Parser/PayloadParsers/JingleParser.cpp @@ -4,10 +4,15 @@ * See Documentation/Licenses/BSD-simplified.txt for more information. */ +/* + * Copyright (c) 2015 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ + #include <Swiften/Parser/PayloadParsers/JingleParser.h> #include <Swiften/Parser/PayloadParserFactory.h> #include <Swiften/Elements/JingleContentPayload.h> -#include <Swiften/Elements/JingleFileTransferReceived.h> #include <Swiften/Elements/JingleFileTransferHash.h> #include <Swiften/Base/Log.h> @@ -60,11 +65,6 @@ namespace Swift { if (payload) { getPayloadInternal()->addContent(payload); } - - boost::shared_ptr<JingleFileTransferReceived> received = boost::dynamic_pointer_cast<JingleFileTransferReceived>(currentPayloadParser->getPayload()); - if (received) { - getPayloadInternal()->addPayload(received); - } boost::shared_ptr<JingleFileTransferHash> hash = boost::dynamic_pointer_cast<JingleFileTransferHash>(currentPayloadParser->getPayload()); if (hash) { |