Handle conference bookmarks w/o nick

1 files changed, 16 insertions, 4 deletions

diff --git a/xmpp-vala/src/module/xep/0048_bookmarks/conference.vala b/xmpp-vala/src/module/xep/0048_bookmarks/conference.vala
index e0988041..21072c3f 100644
--- a/xmpp-vala/src/module/xep/0048_bookmarks/conference.vala
+++ b/xmpp-vala/src/module/xep/0048_bookmarks/conference.vala
@@ -38,10 +38,15 @@ public class Conference : Object {
         }
         set {
             StanzaNode? nick_node = stanza_node.get_subnode(NODE_NICK);
+            if (value == null) {
+                if (nick_node != null) stanza_node.sub_nodes.remove(nick_node);
+                return;
+            }
             if (nick_node == null) {
                 nick_node = new StanzaNode.build(NODE_NICK, NS_URI);
                 stanza_node.put_node(nick_node);
             }
+            nick_node.sub_nodes.clear();
             nick_node.put_node(new StanzaNode.text(value));
         }
     }
@@ -61,14 +66,21 @@ public class Conference : Object {
         }
     }
 
-    public Conference.from_stanza_node(StanzaNode stanza_node) {
-        this.stanza_node = stanza_node;
-    }
-
     public Conference(string jid) {
         this.stanza_node = new StanzaNode.build("conference", NS_URI);
         this.jid = jid;
     }
+
+    public static Conference? create_from_stanza_node(StanzaNode stanza_node) {
+        if (stanza_node.get_attribute(ATTRIBUTE_JID) != null) {
+            return new Conference.from_stanza_node(stanza_node);
+        }
+        return null;
+    }
+
+    private Conference.from_stanza_node(StanzaNode stanza_node) {
+        this.stanza_node = stanza_node;
+    }
 }
 
 }
\ No newline at end of file