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,8 +1,8 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Elements/DiscoInfo.h>
 
@@ -14,13 +14,13 @@ const std::string DiscoInfo::ChatStatesFeature = std::string("http://jabber.org/
 const std::string DiscoInfo::SecurityLabelsFeature = std::string("urn:xmpp:sec-label:0");
 const std::string DiscoInfo::SecurityLabelsCatalogFeature = std::string("urn:xmpp:sec-label:catalog:2");
 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");
 const std::string DiscoInfo::MessageDeliveryReceiptsFeature = std::string("urn:xmpp:receipts");
 const std::string DiscoInfo::WhiteboardFeature = std::string("http://swift.im/whiteboard");
 const std::string DiscoInfo::BlockingCommandFeature = std::string("urn:xmpp:blocking");
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;
-
-};
-
-}