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/gal-a11y-e-table-item.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/gal-a11y-e-table-item.c')
| -rw-r--r-- | e-util/gal-a11y-e-table-item.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/e-util/gal-a11y-e-table-item.c b/e-util/gal-a11y-e-table-item.c index 9f5c407507..51bce1725b 100644 --- a/e-util/gal-a11y-e-table-item.c +++ b/e-util/gal-a11y-e-table-item.c @@ -134,10 +134,11 @@ view_to_model_row (ETableItem *eti, inline static gint view_to_model_col (ETableItem *eti, - gint col) + gint view_col) { - ETableCol *ecol = e_table_header_get_column (eti->header, col); - return ecol ? ecol->col_idx : -1; + ETableCol *ecol = e_table_header_get_column (eti->header, view_col); + + return (ecol != NULL) ? ecol->spec->model_col : -1; } inline static gint @@ -165,14 +166,14 @@ model_to_view_row (ETableItem *eti, inline static gint model_to_view_col (ETableItem *eti, - gint col) + gint model_col) { gint i; - if (col == -1) + if (model_col == -1) return -1; for (i = 0; i < eti->cols; i++) { ETableCol *ecol = e_table_header_get_column (eti->header, i); - if (ecol->col_idx == col) + if (ecol->spec->model_col == model_col) return i; } return -1; @@ -405,7 +406,7 @@ eti_ref_at (AtkTable *table, item, cell_view, ATK_OBJECT (table), - ecol->col_idx, + ecol->spec->model_col, column, row); if (ATK_IS_OBJECT (ret)) { |