From c7f2ca45ba4d57b9bd7aff160325e81a1a761ff0 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Thu, 16 Jul 2015 09:38:19 +0100 Subject: [PATCH] Use the new API. --- src/libmime/mime_expressions.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/libmime/mime_expressions.c b/src/libmime/mime_expressions.c index be49f11d8f..c367ad0733 100644 --- a/src/libmime/mime_expressions.c +++ b/src/libmime/mime_expressions.c @@ -1559,11 +1559,11 @@ static gboolean search_html_node_callback (GNode * node, gpointer data) { struct html_callback_data *cd = data; - struct html_node *nd; + struct html_tag *nd; nd = node->data; if (nd) { - if (nd->tag == cd->tag) { + if (nd->id == cd->tag->id) { *cd->res = TRUE; return TRUE; } @@ -1606,8 +1606,9 @@ rspamd_has_html_tag (struct rspamd_task * task, GArray * args, void *unused) for (i = 0; i < task->text_parts->len && res; i ++) { p = g_ptr_array_index (task->text_parts, i); - if (!IS_PART_EMPTY (p) && IS_PART_HTML (p) && p->html_nodes) { - g_node_traverse (p->html_nodes, + if (!IS_PART_EMPTY (p) && IS_PART_HTML (p) && p->html) { + /* TODO: too slow */ + g_node_traverse (p->html->html_tags, G_PRE_ORDER, G_TRAVERSE_ALL, -1, @@ -1630,7 +1631,7 @@ rspamd_has_fake_html (struct rspamd_task * task, GArray * args, void *unused) for (i = 0; i < task->text_parts->len && res; i ++) { p = g_ptr_array_index (task->text_parts, i); - if (!IS_PART_EMPTY (p) && IS_PART_HTML (p) && p->html_nodes == NULL) { + if (!IS_PART_EMPTY (p) && IS_PART_HTML (p) && p->html->html_tags == NULL) { res = TRUE; } } -- 2.47.3