# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1485798375 -3600
# Node ID 4f3821bda633f128aa653a3744e22cad5dd8eab2
# Parent  245ec6d7338088032fc0220763dfcdd566403187
LM: Use get_child in place of find_child

diff -r 245ec6d73380 -r 4f3821bda633 mcabber/mcabber/xmpp.c
--- a/mcabber/mcabber/xmpp.c	Sun Jan 29 21:39:35 2017 +0100
+++ b/mcabber/mcabber/xmpp.c	Mon Jan 30 18:46:15 2017 +0100
@@ -1158,6 +1158,8 @@
     if (xenc && (p = lm_message_node_get_value(xenc)) != NULL)
       enc = p;
 
+    body = lm_message_node_get_child_value(x, "body");
+    subject = lm_message_node_get_child_value(x, "subject");
     if (body && *body && !subject)
       ns_signed = lm_message_node_find_xmlns(x, NS_SIGNED);
     else
@@ -1445,7 +1447,7 @@
   if (mstype == LM_MESSAGE_SUB_TYPE_ERROR) {
     LmMessageNode *x;
     scr_LogPrint(LPRINT_LOGNORM, "Error presence packet from <%s>", bjid);
-    x = lm_message_node_find_child(m->node, "error");
+    x = lm_message_node_get_child(m->node, "error");
     display_server_error(x, from);
     // Let's check it isn't a nickname conflict.
     // XXX Note: We should handle the <conflict/> string condition.
diff -r 245ec6d73380 -r 4f3821bda633 mcabber/mcabber/xmpp_helper.c
--- a/mcabber/mcabber/xmpp_helper.c	Sun Jan 29 21:39:35 2017 +0100
+++ b/mcabber/mcabber/xmpp_helper.c	Mon Jan 30 18:46:15 2017 +0100
@@ -109,7 +109,7 @@
 
   if (G_UNLIKELY(!node || !child)) return NULL;
 
-  tmp = lm_message_node_find_child(node, child);
+  tmp = lm_message_node_get_child(node, child);
   if (tmp) {
     const gchar *val = lm_message_node_get_value(tmp);
     return (val ? val : "");
diff -r 245ec6d73380 -r 4f3821bda633 mcabber/mcabber/xmpp_iq.c
--- a/mcabber/mcabber/xmpp_iq.c	Sun Jan 29 21:39:35 2017 +0100
+++ b/mcabber/mcabber/xmpp_iq.c	Mon Jan 30 18:46:15 2017 +0100
@@ -556,7 +556,7 @@
   r = lm_message_new_iq_from_query(m, LM_MESSAGE_SUB_TYPE_RESULT);
   query = lm_message_node_add_child(r->node, "query", NULL);
   lm_message_node_set_attribute(query, "xmlns", NS_DISCO_INFO);
-  tmp = lm_message_node_find_child(m->node, "query");
+  tmp = lm_message_node_get_child(m->node, "query");
   if (tmp) {
     node = lm_message_node_get_attribute(tmp, "node");
     param = node+strlen(MCABBER_CAPS_NODE)+1;
@@ -596,7 +596,7 @@
     g_free(servername);
   }
 
-  y = lm_message_node_find_child(lm_message_node_find_xmlns(m->node, NS_ROSTER),
+  y = lm_message_node_get_child(lm_message_node_find_xmlns(m->node, NS_ROSTER),
                                  "item");
   for ( ; y; y = y->next) {
     char *name_tmp = NULL;
@@ -606,8 +606,8 @@
     sub = lm_message_node_get_attribute(y, "subscription");
     ask = lm_message_node_get_attribute(y, "ask");
 
-    if (lm_message_node_find_child(y, "group"))
-      group = lm_message_node_get_value(lm_message_node_find_child(y, "group"));
+    if (lm_message_node_get_child(y, "group"))
+      group = lm_message_node_get_value(lm_message_node_get_child(y, "group"));
     else
       group = NULL;
 
diff -r 245ec6d73380 -r 4f3821bda633 mcabber/mcabber/xmpp_iqrequest.c
--- a/mcabber/mcabber/xmpp_iqrequest.c	Sun Jan 29 21:39:35 2017 +0100
+++ b/mcabber/mcabber/xmpp_iqrequest.c	Mon Jan 30 18:46:15 2017 +0100
@@ -214,7 +214,7 @@
   if (lm_message_get_sub_type(m) != LM_MESSAGE_SUB_TYPE_RESULT)
     return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
 
-  x = lm_message_node_find_child(m->node, "query");
+  x = lm_message_node_get_child(m->node, "query");
   if (!x)
     return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
 
diff -r 245ec6d73380 -r 4f3821bda633 mcabber/mcabber/xmpp_muc.c
--- a/mcabber/mcabber/xmpp_muc.c	Sun Jan 29 21:39:35 2017 +0100
+++ b/mcabber/mcabber/xmpp_muc.c	Mon Jan 30 18:46:15 2017 +0100
@@ -308,7 +308,7 @@
   LmMessageNode *y, *z;
   const char *p, *actorjid, *actornick;
 
-  y = lm_message_node_find_child(xmldata, "item");
+  y = lm_message_node_get_child(xmldata, "item");
   if (!y)
     return;
 
@@ -334,7 +334,7 @@
   *mbjid = lm_message_node_get_attribute(y, "jid");
   *mbnick = lm_message_node_get_attribute(y, "nick");
   // For kick/ban, there can be actor and reason tags
-  z = lm_message_node_find_child(y, "actor");
+  z = lm_message_node_get_child(y, "actor");
   if (z) {
     actornick = lm_message_node_get_attribute(z, "nick");
     actorjid  = lm_message_node_get_attribute(z, "jid");
@@ -658,7 +658,7 @@
     } else {
       // Natural leave
       if (our_presence) {
-        LmMessageNode *destroynode = lm_message_node_find_child(xmldata,
+        LmMessageNode *destroynode = lm_message_node_get_child(xmldata,
                                                                 "destroy");
         if (destroynode) {
           reason = lm_message_node_get_child_value(destroynode, "reason");