diff options
| -rw-r--r-- | widgets/table/e-table-example-1.c | 2 | ||||
| -rw-r--r-- | widgets/table/e-table-example-2.c | 2 | ||||
| -rw-r--r-- | widgets/table/e-table-size-test.c | 2 | ||||
| -rw-r--r-- | widgets/table/e-table-sort-info.c | 8 | ||||
| -rw-r--r-- | widgets/table/test-table.c | 8 |
5 files changed, 11 insertions, 11 deletions
diff --git a/widgets/table/e-table-example-1.c b/widgets/table/e-table-example-1.c index d989c34df7..a3be8dedd0 100644 --- a/widgets/table/e-table-example-1.c +++ b/widgets/table/e-table-example-1.c @@ -77,7 +77,7 @@ <column> 2 </column> \ <column> 3 </column> \ </columns-shown> \ - <grouping> <leaf column=\"1\" ascending=\"1\"/> </grouping> \ + <grouping> <leaf column=\"1\" ascending=\"true\"/> </grouping> \ </ETableSpecification>" char *headers [COLS] = { diff --git a/widgets/table/e-table-example-2.c b/widgets/table/e-table-example-2.c index 6d9dc4abf1..dcc7e244a1 100644 --- a/widgets/table/e-table-example-2.c +++ b/widgets/table/e-table-example-2.c @@ -76,7 +76,7 @@ The headers will be hard coded, as will be the example data. <column> 2 </column> \ <column> 3 </column> \ </columns-shown> \ - <grouping> <leaf column=\"1\" ascending=\"1\"/> </grouping> \ + <grouping> <leaf column=\"1\" ascending=\"true\"/> </grouping> \ </ETableSpecification>" char *headers[VIEW_COLS] = { diff --git a/widgets/table/e-table-size-test.c b/widgets/table/e-table-size-test.c index 9d334583ac..cccd748c39 100644 --- a/widgets/table/e-table-size-test.c +++ b/widgets/table/e-table-size-test.c @@ -76,7 +76,7 @@ <column> 2 </column> \ <column> 3 </column> \ </columns-shown> \ - <grouping> <leaf column=\"1\" ascending=\"1\"/> </grouping> \ + <grouping> <leaf column=\"1\" ascending=\"true\"/> </grouping> \ </ETableSpecification>" char *headers [COLS] = { diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c index aebda2c207..bea5bde0eb 100644 --- a/widgets/table/e-table-sort-info.c +++ b/widgets/table/e-table-sort-info.c @@ -249,14 +249,14 @@ e_table_sort_info_load_from_node (ETableSortInfo *info, for (grouping = node->childs; grouping && !strcmp (grouping->name, "group"); grouping = grouping->childs) { ETableSortColumn column; column.column = e_xml_get_integer_prop_by_name (grouping, "column"); - column.ascending = e_xml_get_integer_prop_by_name (grouping, "ascending"); + 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) { ETableSortColumn column; column.column = e_xml_get_integer_prop_by_name (grouping, "column"); - column.ascending = e_xml_get_integer_prop_by_name (grouping, "ascending"); + column.ascending = e_xml_get_bool_prop_by_name (grouping, "ascending"); e_table_sort_info_sorting_set_nth(info, i++, column); } } @@ -279,7 +279,7 @@ e_table_sort_info_save_to_node (ETableSortInfo *info, xmlNode *new_node = xmlNewChild(node, NULL, "group", NULL); e_xml_set_integer_prop_by_name (new_node, "column", column.column); - e_xml_set_integer_prop_by_name (new_node, "ascending", column.ascending); + e_xml_set_bool_prop_by_name (new_node, "ascending", column.ascending); node = new_node; } @@ -288,7 +288,7 @@ e_table_sort_info_save_to_node (ETableSortInfo *info, xmlNode *new_node = xmlNewChild(node, NULL, "leaf", NULL); e_xml_set_integer_prop_by_name (new_node, "column", column.column); - e_xml_set_integer_prop_by_name (new_node, "ascending", column.ascending); + e_xml_set_bool_prop_by_name (new_node, "ascending", column.ascending); node = new_node; } diff --git a/widgets/table/test-table.c b/widgets/table/test-table.c index 011bc90035..1dcba363fa 100644 --- a/widgets/table/test-table.c +++ b/widgets/table/test-table.c @@ -386,9 +386,9 @@ e_table_test (void) load_data (); if (1){/*getenv ("DO")){*/ - do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <leaf column=\"3\" ascending=\"1\"/> </grouping> </ETableSpecification>"); - do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <group column=\"3\" ascending=\"1\"> <group column=\"4\" ascending=\"0\"> <leaf column=\"2\" ascending=\"1\"/> </group> </group> </grouping> </ETableSpecification>"); + do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <leaf column=\"3\" ascending=\"true\"/> </grouping> </ETableSpecification>"); + do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <group column=\"3\" ascending=\"true\"> <group column=\"4\" ascending=\"false\"> <leaf column=\"2\" ascending=\"true\"/> </group> </group> </grouping> </ETableSpecification>"); } - do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <group column=\"4\" ascending=\"1\"> <leaf column=\"2\" ascending=\"1\"/> </group> </grouping> </ETableSpecification>"); - do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <group column=\"3\" ascending=\"1\"> <leaf column=\"2\" ascending=\"1\"/> </group> </grouping> </ETableSpecification>"); + do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <group column=\"4\" ascending=\"true\"> <leaf column=\"2\" ascending=\"true\"/> </group> </grouping> </ETableSpecification>"); + do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <group column=\"3\" ascending=\"true\"> <leaf column=\"2\" ascending=\"true\"/> </group> </grouping> </ETableSpecification>"); } |