Merge 'upstream/master'

1 files changed, 2 insertions, 6 deletions

diff --git a/xmpp-vala/src/module/xep/0004_data_forms.vala b/xmpp-vala/src/module/xep/0004_data_forms.vala
index 6b5624da..6c16a53d 100644
--- a/xmpp-vala/src/module/xep/0004_data_forms.vala
+++ b/xmpp-vala/src/module/xep/0004_data_forms.vala
@@ -18,6 +18,7 @@ public class DataForm {
     }
 
     public enum Type {
+        UNKNOWN,
         BOOLEAN,
         FIXED,
         HIDDEN,
@@ -44,7 +45,7 @@ public class DataForm {
             get { return node.get_attribute("label", NS_URI); }
             set { node.set_attribute("label", value); }
         }
-        public virtual Type? type_ { get; internal set; default=null; }
+        public virtual Type type_ { get; internal set; default=Type.UNKNOWN; }
         public string? var {
             get { return node.get_attribute("var", NS_URI); }
             set { node.set_attribute("var", value); }
@@ -82,11 +83,6 @@ public class DataForm {
             value_node.put_node(new StanzaNode.text(val));
         }
 
-        internal void add_value_string(string val) {
-            StanzaNode node = new StanzaNode.build("value");
-            node.put_node(new StanzaNode.text(val));
-        }
-
         internal Gee.List<Option>? get_options() {
             Gee.List<Option> ret = new ArrayList<Option>();
             Gee.List<StanzaNode> option_nodes = node.get_subnodes("option", NS_URI);