diff options
| -rw-r--r-- | e-util/e-xml-utils.c | 8 | ||||
| -rw-r--r-- | widgets/table/e-table-sort-info.c | 6 | ||||
| -rw-r--r-- | widgets/table/e-tree-table-adapter.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c index 3754d42ba2..1285b5ce75 100644 --- a/e-util/e-xml-utils.c +++ b/e-util/e-xml-utils.c @@ -39,7 +39,7 @@ e_xml_get_child_by_name (const xmlNode *parent, const xmlChar *child_name) g_return_val_if_fail (parent != NULL, NULL); g_return_val_if_fail (child_name != NULL, NULL); - for (child = parent->childs; child != NULL; child = child->next) { + for (child = parent->xmlChildrenNode; child != NULL; child = child->next) { if (xmlStrcmp (child->name, child_name) == 0) { return child; } @@ -70,7 +70,7 @@ e_xml_get_child_by_name_by_lang (const xmlNode *parent, lang = setlocale (LC_CTYPE, NULL); #endif } - for (child = parent->childs; child != NULL; child = child->next) { + for (child = parent->xmlChildrenNode; child != NULL; child = child->next) { if (xmlStrcmp (child->name, child_name) == 0) { xmlChar *this_lang = xmlGetProp (child, "lang"); if (this_lang == NULL) { @@ -91,7 +91,7 @@ e_xml_get_child_by_name_by_lang_list_with_score (const xmlNode *parent, { xmlNodePtr best_node = NULL, node; - for (node = parent->childs; node != NULL; node = node->next) { + for (node = parent->xmlChildrenNode; node != NULL; node = node->next) { xmlChar *lang; if (node->name == NULL || strcmp (node->name, name) != 0) { @@ -159,7 +159,7 @@ e_xml_get_child_by_name_no_lang (const xmlNode *parent, const gchar *name) g_return_val_if_fail (parent != NULL, NULL); g_return_val_if_fail (name != NULL, NULL); - for (node = parent->childs; node != NULL; node = node->next) { + for (node = parent->xmlChildrenNode; node != NULL; node = node->next) { xmlChar *lang; if (node->name == NULL || strcmp (node->name, name) != 0) { diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c index ffe6eaf5ce..737451fff3 100644 --- a/widgets/table/e-table-sort-info.c +++ b/widgets/table/e-table-sort-info.c @@ -362,14 +362,14 @@ e_table_sort_info_load_from_node (ETableSortInfo *info, if (state_version <= 0.05) { i = 0; - for (grouping = node->childs; grouping && !strcmp (grouping->name, "group"); grouping = grouping->childs) { + for (grouping = node->xmlChildrenNode; grouping && !strcmp (grouping->name, "group"); grouping = grouping->xmlChildrenNode) { ETableSortColumn column; column.column = e_xml_get_integer_prop_by_name (grouping, "column"); column.ascending = e_xml_get_bool_prop_by_name (grouping, "ascending"); e_table_sort_info_grouping_set_nth(info, i++, column); } i = 0; - for (; grouping && !strcmp (grouping->name, "leaf"); grouping = grouping->childs) { + for (; grouping && !strcmp (grouping->name, "leaf"); grouping = grouping->xmlChildrenNode) { ETableSortColumn column; column.column = e_xml_get_integer_prop_by_name (grouping, "column"); column.ascending = e_xml_get_bool_prop_by_name (grouping, "ascending"); @@ -377,7 +377,7 @@ e_table_sort_info_load_from_node (ETableSortInfo *info, } } else { i = 0; - for (grouping = node->childs; grouping && !strcmp (grouping->name, "group"); grouping = grouping->next) { + for (grouping = node->xmlChildrenNode; grouping && !strcmp (grouping->name, "group"); grouping = grouping->next) { ETableSortColumn column; column.column = e_xml_get_integer_prop_by_name (grouping, "column"); column.ascending = e_xml_get_bool_prop_by_name (grouping, "ascending"); diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c index 384e21da21..d22bbeba6b 100644 --- a/widgets/table/e-tree-table-adapter.c +++ b/widgets/table/e-tree-table-adapter.c @@ -886,7 +886,7 @@ e_tree_table_adapter_load_expanded_state (ETreeTableAdapter *etta, const char *f return; } - for (child = root->childs; child; child = child->next) { + for (child = root->xmlChildrenNode; child; child = child->next) { char *id; if (strcmp (child->name, "node")) { |