From 8139ba9425da46085769d1bcb6c8f8a1f22647ed Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Fri, 19 May 2000 04:35:12 +0000 Subject: From a patch by Iain Holmes 2000-05-19 Christopher James Lahey From a patch by Iain Holmes * e-table-config.c, e-table.c: Fixed getting text content from a node in the case of a non string based content field in the xml library. svn path=/trunk/; revision=3133 --- widgets/e-table/ChangeLog | 8 ++++++++ widgets/e-table/e-table-config.c | 8 +++++++- widgets/e-table/e-table.c | 8 +++++++- widgets/table/e-table-config.c | 8 +++++++- widgets/table/e-table.c | 8 +++++++- 5 files changed, 36 insertions(+), 4 deletions(-) (limited to 'widgets') diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog index 6d2a63fc3a..8d26a03b34 100644 --- a/widgets/e-table/ChangeLog +++ b/widgets/e-table/ChangeLog @@ -1,3 +1,11 @@ +2000-05-19 Christopher James Lahey + +From a patch by Iain Holmes + + * e-table-config.c, e-table.c: Fixed getting text content from a + node in the case of a non string based content field in the xml + library. + 2000-05-16 Christopher James Lahey * e-table-item.c: Fixed a memory leak. diff --git a/widgets/e-table/e-table-config.c b/widgets/e-table/e-table-config.c index 16cf04eec7..5d078f8f86 100644 --- a/widgets/e-table/e-table-config.c +++ b/widgets/e-table/e-table-config.c @@ -10,6 +10,7 @@ #include #include #include +#include #include "e-util/e-util.h" #include "e-util/e-xml-utils.h" #include "e-util/e-canvas.h" @@ -46,7 +47,12 @@ get_fields (ETable *etable, xmlNode *xmlRoot) for (column = xmlColumns->childs; column; column = column->next){ ETableCol *ecol; - int col = atoi (column->childs->content); + char *content; + int col; + + content = xmlNodeListGetString (column->doc, column->childs, 1); + col = atoi (content); + xmlFree (content); ecol = e_table_header_get_column (etable->header, col); diff --git a/widgets/e-table/e-table.c b/widgets/e-table/e-table.c index ae900f084f..5e83d9fce9 100644 --- a/widgets/e-table/e-table.c +++ b/widgets/e-table/e-table.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "e-util/e-util.h" #include "e-util/e-xml-utils.h" #include "e-util/e-canvas.h" @@ -313,7 +314,12 @@ et_xml_to_header (ETable *e_table, ETableHeader *full_header, xmlNode *xmlColumn nh = e_table_header_new (); for (column = xmlColumns->childs; column; column = column->next) { - int col = atoi (column->childs->content); + gchar *content; + int col; + + content = xmlNodeListGetString (column->doc, column->childs, 1); + col = atoi (content); + xmlFree (content); if (col >= max_cols) continue; diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c index 16cf04eec7..5d078f8f86 100644 --- a/widgets/table/e-table-config.c +++ b/widgets/table/e-table-config.c @@ -10,6 +10,7 @@ #include #include #include +#include #include "e-util/e-util.h" #include "e-util/e-xml-utils.h" #include "e-util/e-canvas.h" @@ -46,7 +47,12 @@ get_fields (ETable *etable, xmlNode *xmlRoot) for (column = xmlColumns->childs; column; column = column->next){ ETableCol *ecol; - int col = atoi (column->childs->content); + char *content; + int col; + + content = xmlNodeListGetString (column->doc, column->childs, 1); + col = atoi (content); + xmlFree (content); ecol = e_table_header_get_column (etable->header, col); diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index ae900f084f..5e83d9fce9 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "e-util/e-util.h" #include "e-util/e-xml-utils.h" #include "e-util/e-canvas.h" @@ -313,7 +314,12 @@ et_xml_to_header (ETable *e_table, ETableHeader *full_header, xmlNode *xmlColumn nh = e_table_header_new (); for (column = xmlColumns->childs; column; column = column->next) { - int col = atoi (column->childs->content); + gchar *content; + int col; + + content = xmlNodeListGetString (column->doc, column->childs, 1); + col = atoi (content); + xmlFree (content); if (col >= max_cols) continue; -- cgit v1.2.3