From 30cb222f96d95d62ac75fdf454f8b4a20001d3d5 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Wed, 18 Jul 2012 13:18:17 +0200
Subject: don't write null form values

---
 src/base/QXmppDataForm.cpp | 2 +-
 tests/tests.cpp            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/base/QXmppDataForm.cpp b/src/base/QXmppDataForm.cpp
index 36e2c53d..e7506644 100644
--- a/src/base/QXmppDataForm.cpp
+++ b/src/base/QXmppDataForm.cpp
@@ -598,7 +598,7 @@ void QXmppDataForm::toXml(QXmlStreamWriter *writer) const
             foreach (const QString &value, field.value().toStringList())
                 helperToXmlAddTextElement(writer, "value", value);
         }
-        else
+        else if (!field.value().isNull())
         {
             helperToXmlAddTextElement(writer, "value", field.value().toString());
         }
diff --git a/tests/tests.cpp b/tests/tests.cpp
index 8d74938a..53cd1f3e 100644
--- a/tests/tests.cpp
+++ b/tests/tests.cpp
@@ -945,10 +945,9 @@ void TestDataForm::testSimple()
 {
     const QByteArray xml(
         "<x xmlns=\"jabber:x:data\" type=\"form\">"
-        "<title>Search</title>"
+        "<title>Joggle Search</title>"
         "<instructions>Fill out this form to search for information!</instructions>"
         "<field type=\"text-single\" var=\"search_request\">"
-        "<value/>"
         "<required/>"
         "</field>"
         "</x>");
@@ -957,7 +956,8 @@ void TestDataForm::testSimple()
     parsePacket(form, xml);
 
     QCOMPARE(form.isNull(), false);
-    QCOMPARE(form.instructions(), QString("Fill out this form to search for information!"));
+    QCOMPARE(form.title(), QLatin1String("Joggle Search"));
+    QCOMPARE(form.instructions(), QLatin1String("Fill out this form to search for information!"));
     QCOMPARE(form.fields().size(), 1);
     QCOMPARE(form.fields().at(0).type(), QXmppDataForm::Field::TextSingleField);
     QCOMPARE(form.fields().at(0).isRequired(), true);
-- 
cgit v1.2.3