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-group-container.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-group-container.c')
| -rw-r--r-- | e-util/e-table-group-container.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/e-util/e-table-group-container.c b/e-util/e-table-group-container.c index 6fe5898f9a..68239b123f 100644 --- a/e-util/e-table-group-container.c +++ b/e-util/e-table-group-container.c @@ -76,7 +76,7 @@ e_table_group_container_child_node_free (ETableGroupContainer *etgc, g_object_run_dispose (G_OBJECT (child)); e_table_model_free_value ( - etg->model, etgc->ecol->col_idx, + etg->model, etgc->ecol->spec->model_col, child_node->key); g_free (child_node->string); g_object_run_dispose (G_OBJECT (child_node->text)); @@ -515,9 +515,9 @@ create_child_node (ETableGroupContainer *etgc, G_CALLBACK (child_start_drag), etgc); child_node->child = child; child_node->key = e_table_model_duplicate_value ( - etg->model, etgc->ecol->col_idx, val); + etg->model, etgc->ecol->spec->model_col, val); child_node->string = e_table_model_value_to_string ( - etg->model, etgc->ecol->col_idx, val); + etg->model, etgc->ecol->spec->model_col, val); child_node->count = 0; return child_node; @@ -536,7 +536,8 @@ etgc_add (ETableGroup *etg, gpointer val; gint i = 0; - val = e_table_model_value_at (etg->model, etgc->ecol->col_idx, row); + val = e_table_model_value_at ( + etg->model, etgc->ecol->spec->model_col, row); for (; list; list = g_list_next (list), i++) { gint comp_val; @@ -592,14 +593,14 @@ etgc_add_array (ETableGroup *etg, cmp_cache = e_table_sorting_utils_create_cmp_cache (); lastval = e_table_model_value_at ( - etg->model, etgc->ecol->col_idx, array[0]); + etg->model, etgc->ecol->spec->model_col, array[0]); for (i = 1; i < count; i++) { gpointer val; gint comp_val; val = e_table_model_value_at ( - etg->model, etgc->ecol->col_idx, array[i]); + etg->model, etgc->ecol->spec->model_col, array[i]); comp_val = (*comp)(lastval, val, cmp_cache); if (comp_val != 0) { |