From 96b07a2ff024c6e852344f4614735132219d2104 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 26 Jun 2013 19:02:43 -0400 Subject: ETableCol: Embed an ETableColumnSpecification. Eliminates a few redundant fields. --- e-util/e-table-utils.c | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) (limited to 'e-util/e-table-utils.c') diff --git a/e-util/e-table-utils.c b/e-util/e-table-utils.c index 207da0c04c..3c598e38a9 100644 --- a/e-util/e-table-utils.c +++ b/e-util/e-table-utils.c @@ -104,39 +104,25 @@ et_col_spec_to_col (ETableColumnSpecification *col_spec, ete, col_spec->pixbuf); if (icon_name != NULL) { col = e_table_col_new ( - col_spec->model_col, + col_spec, title, icon_name, - col_spec->expansion, - col_spec->minimum_width, - cell, compare, - col_spec->resizable, - col_spec->disabled, - col_spec->priority); + cell, compare); } } if (col == NULL && col_spec->title && *col_spec->title) { col = e_table_col_new ( - col_spec->model_col, title, NULL, - col_spec->expansion, - col_spec->minimum_width, - cell, compare, - col_spec->resizable, - col_spec->disabled, - col_spec->priority); + col_spec, + title, NULL, + cell, compare); } - if (col) { + if (col != NULL) col->search = search; - col->sortable = col_spec->sortable; - } + g_free (title); } - if (col && col_spec->compare_col != col_spec->model_col) - g_object_set ( - col, - "compare_col", col_spec->compare_col, - NULL); + return col; } -- cgit v1.2.3