force single single document over a node's lifetime

diff --git a/src/jabber_whiteboard/inkboard-document.cpp b/src/jabber_whiteboard/inkboard-document.cpp
index 7e4afff8d0ed9cada79135d468b4e063cc0f9aca..d4274f139e5684a5be553d013268df56a822aedf 100644 (file)
--- a/src/jabber_whiteboard/inkboard-document.cpp
+++ b/src/jabber_whiteboard/inkboard-document.cpp
@@ -44,7 +44,7 @@ namespace Whiteboard {
 
 InkboardDocument::InkboardDocument(int code, State::SessionType sessionType,
                                    Glib::ustring const& to)
-: XML::SimpleNode(code, NULL), sessionType(sessionType), recipient(to),
+: XML::SimpleNode(code, this), sessionType(sessionType), recipient(to),
   _in_transaction(false)
 {
     _initBindings();

diff --git a/src/xml/simple-document.h b/src/xml/simple-document.h
index 9b3157add52873b326d28561c6ae9ce7660e5164..f2648e18805a4255171cb1663b49b8a7515d5979 100644 (file)
--- a/src/xml/simple-document.h
+++ b/src/xml/simple-document.h
@@ -30,7 +30,7 @@ class SimpleDocument : public SimpleNode,
 {
 public:
     explicit SimpleDocument()
-    : SimpleNode(g_quark_from_static_string("xml"), NULL),
+    : SimpleNode(g_quark_from_static_string("xml"), this),
       _in_transaction(false)
     {
         _initBindings();

diff --git a/src/xml/simple-node.cpp b/src/xml/simple-node.cpp
index 8ddc5b167ef5c0f2c8e8017aaa394be03d45a321..d4a412ae63e1fb3e803283b37fba6085e1439fa0 100644 (file)
--- a/src/xml/simple-node.cpp
+++ b/src/xml/simple-node.cpp
@@ -164,6 +164,8 @@ SimpleNode::SimpleNode(int code, Document *document)
 : Node(), _name(code), _attributes(), _child_count(0),
   _cached_positions_valid(false)
 {
+    g_assert(document != NULL);
+
     this->_document = document;
     this->_parent = this->_next = NULL;
     this->_first_child = this->_last_child = NULL;
@@ -178,6 +180,8 @@ SimpleNode::SimpleNode(SimpleNode const &node, Document *document)
   _child_count(node._child_count),
   _cached_positions_valid(node._cached_positions_valid)
 {
+    g_assert(document != NULL);
+
     _document = document;
     _parent = _next = NULL;
     _first_child = _last_child = NULL;