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/Elements | |
| 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/Elements')
| -rw-r--r-- | Swiften/Elements/DiscoInfo.cpp | 4 | ||||
| -rw-r--r-- | Swiften/Elements/JingleFileTransferReceived.h | 33 |
2 files changed, 2 insertions, 35 deletions
diff --git a/Swiften/Elements/DiscoInfo.cpp b/Swiften/Elements/DiscoInfo.cpp index ddd8260..84f5ed3 100644 --- a/Swiften/Elements/DiscoInfo.cpp +++ b/Swiften/Elements/DiscoInfo.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -17,7 +17,7 @@ const std::string DiscoInfo::JabberSearchFeature = std::string("jabber:iq:search const std::string DiscoInfo::CommandsFeature = std::string("http://jabber.org/protocol/commands"); const std::string DiscoInfo::MessageCorrectionFeature = std::string("urn:xmpp:message-correct:0"); const std::string DiscoInfo::JingleFeature = std::string("urn:xmpp:jingle:1"); -const std::string DiscoInfo::JingleFTFeature = std::string("urn:xmpp:jingle:apps:file-transfer:3"); +const std::string DiscoInfo::JingleFTFeature = std::string("urn:xmpp:jingle:apps:file-transfer:4"); const std::string DiscoInfo::JingleTransportsIBBFeature = std::string("urn:xmpp:jingle:transports:ibb:1"); const std::string DiscoInfo::JingleTransportsS5BFeature = std::string("urn:xmpp:jingle:transports:s5b:1"); const std::string DiscoInfo::Bytestream = std::string("http://jabber.org/protocol/bytestreams"); diff --git a/Swiften/Elements/JingleFileTransferReceived.h b/Swiften/Elements/JingleFileTransferReceived.h deleted file mode 100644 index 75c95d9..0000000 --- a/Swiften/Elements/JingleFileTransferReceived.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2011 Tobias Markmann - * Licensed under the simplified BSD license. - * See Documentation/Licenses/BSD-simplified.txt for more information. - */ - -#pragma once - -#include <boost/shared_ptr.hpp> -#include <vector> - -#include <Swiften/Elements/StreamInitiationFileInfo.h> -#include <Swiften/Elements/Payload.h> - -namespace Swift { - -class JingleFileTransferReceived : public Payload { - public: - typedef boost::shared_ptr<JingleFileTransferReceived> ref; - - void setFileInfo(const StreamInitiationFileInfo& fileInfo) { - this->fileInfo = fileInfo; - } - - const StreamInitiationFileInfo& getFileInfo() const { - return this->fileInfo; - } - private: - StreamInitiationFileInfo fileInfo; - -}; - -} |