Rename to WockyStanza, WockyNode and related changes

1 files changed, 12 insertions, 7 deletions

diff --git a/src/util.c b/src/util.c
index f37b993b..07994ad7 100644
--- a/src/util.c
+++ b/src/util.c
@@ -164,7 +164,7 @@ lm_message_node_get_child_any_ns (LmMessageNode *node, const gchar *name)
 const gchar *
 lm_message_node_get_namespace (LmMessageNode *node)
 {
-  return wocky_xmpp_node_get_ns (node);
+  return wocky_node_get_ns (node);
 }
 
 const gchar *
@@ -189,7 +189,10 @@ lm_message_node_get_child_with_namespace (LmMessageNode *node,
   LmMessageNode *found;
   NodeIter i;
 
-  found = wocky_xmpp_node_get_child_ns (node, name, ns);
+  NODE_DEBUG (node, name);
+  NODE_DEBUG (node, ns);
+
+  found = wocky_node_get_child_ns (node, name, ns);
   if (found != NULL)
     return found;
 
@@ -239,9 +242,9 @@ lm_message_node_add_build_va (LmMessageNode *node, guint spec, va_list ap)
             g_return_if_fail (key != NULL);
             g_return_if_fail (value != NULL);
             if (!tp_strdiff (key, "xmlns"))
-              wocky_xmpp_node_set_ns (stack->data, value);
+              wocky_node_set_ns (stack->data, value);
             else if (!tp_strdiff (key, "xml:lang"))
-              wocky_xmpp_node_set_language (stack->data, value);
+              wocky_node_set_language (stack->data, value);
             else
               lm_message_node_set_attribute (stack->data, key, value);
           }
@@ -319,7 +322,8 @@ lm_message_build (const gchar *to, LmMessageType type, guint spec, ...)
 
   msg = lm_message_new (to, type);
   va_start (ap, spec);
-  lm_message_node_add_build_va (msg->node, spec, ap);
+  lm_message_node_add_build_va (
+      wocky_stanza_get_top_node (msg), spec, ap);
   va_end (ap);
   return msg;
 }
@@ -339,7 +343,8 @@ lm_message_build_with_sub_type (const gchar *to, LmMessageType type,
 
   msg = lm_message_new_with_sub_type (to, type, sub_type);
   va_start (ap, spec);
-  lm_message_node_add_build_va (msg->node, spec, ap);
+  lm_message_node_add_build_va (
+      wocky_stanza_get_top_node (msg), spec, ap);
   va_end (ap);
   return msg;
 }
@@ -997,7 +1002,7 @@ lm_message_node_get_attribute_with_namespace (LmMessageNode *node,
     const gchar *attribute,
     const gchar *ns)
 {
-  return wocky_xmpp_node_get_attribute_ns (node, attribute, ns);
+  return wocky_node_get_attribute_ns (node, attribute, ns);
 }
 
 GPtrArray *