2 files changed, 29 insertions, 1 deletions
diff --git a/Swiften/Parser/PayloadParsers/RosterParser.cpp b/Swiften/Parser/PayloadParsers/RosterParser.cpp
index ba19fbf..0da9f48 100644
--- a/Swiften/Parser/PayloadParsers/RosterParser.cpp
+++ b/Swiften/Parser/PayloadParsers/RosterParser.cpp
@@ -13,7 +13,13 @@ RosterParser::RosterParser() : level_(TopLevel), inItem_(false), unknownContentP
 }
 
 void RosterParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
-	if (level_ == PayloadLevel) {
+	if (level_ == TopLevel) {
+		AttributeMap::const_iterator i = attributes.find("ver");
+		if (i != attributes.end()) {
+			getPayloadInternal()->setVersion(i->second);
+		}
+	}
+	else if (level_ == PayloadLevel) {
 		if (element == "item") {
 			inItem_ = true;
 			currentItem_ = RosterItemPayload();
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/RosterParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/RosterParserTest.cpp
index 1bcea0e..3102b74 100644
--- a/Swiften/Parser/PayloadParsers/UnitTest/RosterParserTest.cpp
+++ b/Swiften/Parser/PayloadParsers/UnitTest/RosterParserTest.cpp
@@ -17,6 +17,8 @@ class RosterParserTest : public CppUnit::TestFixture
 		CPPUNIT_TEST_SUITE(RosterParserTest);
 		CPPUNIT_TEST(testParse);
 		CPPUNIT_TEST(testParse_ItemWithUnknownContent);
+		CPPUNIT_TEST(testParse_WithVersion);
+		CPPUNIT_TEST(testParse_WithEmptyVersion);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
@@ -32,6 +34,8 @@ class RosterParserTest : public CppUnit::TestFixture
 				"</query>"));
 
 			RosterPayload* payload = dynamic_cast<RosterPayload*>(parser.getPayload().get());
+
+			CPPUNIT_ASSERT(!payload->getVersion());
 			const RosterPayload::RosterItemPayloads& items = payload->getItems();
 
 			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), items.size());
@@ -74,6 +78,24 @@ class RosterParserTest : public CppUnit::TestFixture
 				"<baz xmlns=\"jabber:iq:roster\"><fum xmlns=\"jabber:iq:roster\">foo</fum></baz>"
 				), items[0].getUnknownContent());
 		}
+
+		void testParse_WithVersion() {
+			PayloadsParserTester parser;
+			CPPUNIT_ASSERT(parser.parse("<query xmlns='jabber:iq:roster' ver='ver10'/>"));
+
+			RosterPayload* payload = dynamic_cast<RosterPayload*>(parser.getPayload().get());
+			CPPUNIT_ASSERT(payload->getVersion());
+			CPPUNIT_ASSERT_EQUAL(std::string("ver10"), *payload->getVersion());
+		}
+
+		void testParse_WithEmptyVersion() {
+			PayloadsParserTester parser;
+			CPPUNIT_ASSERT(parser.parse("<query xmlns='jabber:iq:roster' ver=''/>"));
+
+			RosterPayload* payload = dynamic_cast<RosterPayload*>(parser.getPayload().get());
+			CPPUNIT_ASSERT(payload->getVersion());
+			CPPUNIT_ASSERT_EQUAL(std::string(""), *payload->getVersion());
+		}
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(RosterParserTest);