Mercurial > ~mikael > mcabber > hg
diff mcabber/mcabber/xmpp.c @ 2303:4f3821bda633
LM: Use get_child in place of find_child
author | Mikael Berthe <mikael@lilotux.net> |
---|---|
date | Mon, 30 Jan 2017 18:46:15 +0100 |
parents | eb96666502f5 |
children | def5f64c253d |
line wrap: on
line diff
--- 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.