diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-06-27 07:02:43 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-07-02 22:34:09 +0800 |
| commit | 96b07a2ff024c6e852344f4614735132219d2104 (patch) | |
| tree | 95c9bdb74cde0769a31399cc6d2b92415b37ba32 /e-util/e-table-utils.c | |
| parent | d40e5a8ba1e7d362415be17d0ccde4477243839d (diff) | |
| download | gsoc2013-evolution-96b07a2ff024c6e852344f4614735132219d2104.tar gsoc2013-evolution-96b07a2ff024c6e852344f4614735132219d2104.tar.gz gsoc2013-evolution-96b07a2ff024c6e852344f4614735132219d2104.tar.bz2 gsoc2013-evolution-96b07a2ff024c6e852344f4614735132219d2104.tar.lz gsoc2013-evolution-96b07a2ff024c6e852344f4614735132219d2104.tar.xz gsoc2013-evolution-96b07a2ff024c6e852344f4614735132219d2104.tar.zst gsoc2013-evolution-96b07a2ff024c6e852344f4614735132219d2104.zip | |
ETableCol: Embed an ETableColumnSpecification.
Eliminates a few redundant fields.
Diffstat (limited to 'e-util/e-table-utils.c')
| -rw-r--r-- | e-util/e-table-utils.c | 30 |
1 files changed, 8 insertions, 22 deletions
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; } |