summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Swiften/Elements/Storage.h2
-rw-r--r--Swiften/Parser/LibXMLParser.cpp6
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/RawXMLPayloadParserTest.cpp6
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/PrivateStorageSerializerTest.cpp2
4 files changed, 12 insertions, 4 deletions
diff --git a/Swiften/Elements/Storage.h b/Swiften/Elements/Storage.h
index 00099c5..1458836 100644
--- a/Swiften/Elements/Storage.h
+++ b/Swiften/Elements/Storage.h
@@ -10,6 +10,8 @@ namespace Swift {
class Storage : public Payload {
public:
struct Conference {
+ Conference() : autoJoin(false) {}
+
String name;
JID jid;
bool autoJoin;
diff --git a/Swiften/Parser/LibXMLParser.cpp b/Swiften/Parser/LibXMLParser.cpp
index 91ff72b..f43ed00 100644
--- a/Swiften/Parser/LibXMLParser.cpp
+++ b/Swiften/Parser/LibXMLParser.cpp
@@ -26,6 +26,12 @@ static void handleCharacterData(void* client, const xmlChar* data, int len) {
}
static void handleError(void*, const char*, ... ) {
+ /*
+ va_list args;
+ va_start(args, m);
+ vfprintf(stdout, m, args);
+ va_end(args);
+ */
}
static void handleWarning(void*, const char*, ... ) {
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/RawXMLPayloadParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/RawXMLPayloadParserTest.cpp
index 5a2be8d..81cc207 100644
--- a/Swiften/Parser/PayloadParsers/UnitTest/RawXMLPayloadParserTest.cpp
+++ b/Swiften/Parser/PayloadParsers/UnitTest/RawXMLPayloadParserTest.cpp
@@ -20,9 +20,9 @@ class RawXMLPayloadParserTest : public CppUnit::TestFixture
PayloadParserTester parser(&testling);
String xml =
- "<foo foo-attr=\"foo-val\" xmlns=\"foo-ns\">"
- "<bar bar-attr=\"bar-val\" xmlns=\"bar-ns\"/>"
- "<baz baz-attr=\"baz-val\" xmlns=\"baz-ns\"/>"
+ "<foo foo-attr=\"foo-val\" xmlns=\"ns:foo\">"
+ "<bar bar-attr=\"bar-val\" xmlns=\"ns:bar\"/>"
+ "<baz baz-attr=\"baz-val\" xmlns=\"ns:baz\"/>"
"</foo>";
CPPUNIT_ASSERT(parser.parse(xml));
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/PrivateStorageSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/PrivateStorageSerializerTest.cpp
index 37c3adb..7f0d5c9 100644
--- a/Swiften/Serializer/PayloadSerializers/UnitTest/PrivateStorageSerializerTest.cpp
+++ b/Swiften/Serializer/PayloadSerializers/UnitTest/PrivateStorageSerializerTest.cpp
@@ -31,7 +31,7 @@ class PrivateStorageSerializerTest : public CppUnit::TestFixture {
"<query xmlns=\"jabber:iq:private\">"
"<storage xmlns=\"storage:bookmarks\">"
"<conference "
- "autojoin=\"1\" "
+ "autojoin=\"0\" "
"jid=\"swift@rooms.swift.im\" "
"name=\"Swift\">"
"<nick>Alice</nick>"