From 6c9ab286f209266e627bd011847c3b5d6476ddab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Remko=20Tron=C3=A7on?= Date: Thu, 9 Dec 2010 22:47:44 +0100 Subject: Fixed namespace of stream error children. diff --git a/Swiften/Parser/StreamErrorParser.cpp b/Swiften/Parser/StreamErrorParser.cpp index b121ef2..3d30d77 100644 --- a/Swiften/Parser/StreamErrorParser.cpp +++ b/Swiften/Parser/StreamErrorParser.cpp @@ -15,9 +15,9 @@ void StreamErrorParser::handleStartElement(const String&, const String&, const A ++level; } -void StreamErrorParser::handleEndElement(const String& element, const String&) { +void StreamErrorParser::handleEndElement(const String& element, const String& ns) { --level; - if (level == ElementLevel) { + if (level == ElementLevel && ns == "urn:ietf:params:xml:ns:xmpp-streams") { if (element == "text") { getElementGeneric()->setText(currentText); } diff --git a/Swiften/Serializer/StreamErrorSerializer.cpp b/Swiften/Serializer/StreamErrorSerializer.cpp index 720c414..14dd13f 100644 --- a/Swiften/Serializer/StreamErrorSerializer.cpp +++ b/Swiften/Serializer/StreamErrorSerializer.cpp @@ -46,10 +46,10 @@ String StreamErrorSerializer::serialize(boost::shared_ptr element) con case StreamError::UnsupportedVersion: typeTag = "unsupported-version"; break; case StreamError::XMLNotWellFormed: typeTag = "xml-not-well-formed"; break; } - errorElement.addNode(boost::make_shared(typeTag, "")); + errorElement.addNode(boost::make_shared(typeTag, "urn:ietf:params:xml:ns:xmpp-streams")); if (!error->getText().isEmpty()) { - errorElement.addNode(boost::make_shared("text", "", error->getText())); + errorElement.addNode(boost::make_shared("text", "urn:ietf:params:xml:ns:xmpp-streams", error->getText())); } return errorElement.serialize(); -- cgit v0.10.2-6-g49f6