1 files changed, 4 insertions, 6 deletions
diff --git a/Swiften/Parser/PayloadParsers/MIXJoinParser.cpp b/Swiften/Parser/PayloadParsers/MIXJoinParser.cpp
index 2509667..6e72f90 100644
--- a/Swiften/Parser/PayloadParsers/MIXJoinParser.cpp
+++ b/Swiften/Parser/PayloadParsers/MIXJoinParser.cpp
@@ -3,19 +3,18 @@
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 #include <Swiften/Parser/PayloadParsers/MIXJoinParser.h>
 
 #include <boost/optional.hpp>
 
 #include <Swiften/Parser/PayloadParserFactory.h>
-#include <Swiften/Parser/PayloadParsers/MIXSubscribeParser.h>
 #include <Swiften/Parser/PayloadParsers/FormParser.h>
 
 using namespace Swift;
 
 MIXJoinParser::MIXJoinParser() : level_(0) {
 }
 
 MIXJoinParser::~MIXJoinParser() {
 }
@@ -29,20 +28,22 @@ void MIXJoinParser::handleStartElement(const std::string& element, const std::st
         }
         if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("jid")) {
             if (boost::optional<JID> jid = JID::parse(*attributeValue)) {
                 getPayloadInternal()->setJID(*jid);
             }
         }
     }
 
     if (level_ == 1) {
-        if (element == "subscribe" && ns == "urn:xmpp:mix:1") {
-            currentPayloadParser_ = std::make_shared<MIXSubscribeParser>();
+        if (element == "subscribe" && ns == "urn:xmpp:mix:0") {
+            if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("node")) {
+                getPayloadInternal()->addSubscription(*attributeValue);
+            }
         }
         if (element == "x" && ns == "jabber:x:data") {
             currentPayloadParser_ = std::make_shared<FormParser>();
         }
     }
 
     if (level_ >= 1 && currentPayloadParser_) {
         currentPayloadParser_->handleStartElement(element, ns, attributes);
     }
@@ -51,21 +52,18 @@ void MIXJoinParser::handleStartElement(const std::string& element, const std::st
 
 void MIXJoinParser::handleEndElement(const std::string& element, const std::string& ns) {
     --level_;
     if (currentPayloadParser_) {
         if (level_ >= 1) {
             currentPayloadParser_->handleEndElement(element, ns);
         }
 
         if (level_ == 1) {
-            if (element == "subscribe" && ns == "urn:xmpp:mix:1") {
-                getPayloadInternal()->addSubscription(std::dynamic_pointer_cast<MIXSubscribe>(currentPayloadParser_->getPayload()));
-            }
             if (element == "x" && ns == "jabber:x:data") {
                 getPayloadInternal()->setForm(std::dynamic_pointer_cast<Form>(currentPayloadParser_->getPayload()));
             }
             currentPayloadParser_.reset();
         }
     }
 }
 
 void MIXJoinParser::handleCharacterData(const std::string& data) {