diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2013-06-27 04:13:10 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2013-07-02 22:34:09 +0800 |
commit | a26bdd4ed4fe7e9fe511b53a013ae7b7e029710b (patch) | |
tree | cd56cc63ee06deb083b6ffaae89b2dc3075df86e /e-util/e-table-utils.c | |
parent | 93987da1f5e4733e0eb0ba944f06809b4e4d52cb (diff) | |
download | gsoc2013-evolution-a26bdd4ed4fe7e9fe511b53a013ae7b7e029710b.tar gsoc2013-evolution-a26bdd4ed4fe7e9fe511b53a013ae7b7e029710b.tar.gz gsoc2013-evolution-a26bdd4ed4fe7e9fe511b53a013ae7b7e029710b.tar.bz2 gsoc2013-evolution-a26bdd4ed4fe7e9fe511b53a013ae7b7e029710b.tar.lz gsoc2013-evolution-a26bdd4ed4fe7e9fe511b53a013ae7b7e029710b.tar.xz gsoc2013-evolution-a26bdd4ed4fe7e9fe511b53a013ae7b7e029710b.tar.zst gsoc2013-evolution-a26bdd4ed4fe7e9fe511b53a013ae7b7e029710b.zip |
ETableState: Convert the column index array to a column spec array.
Diffstat (limited to 'e-util/e-table-utils.c')
-rw-r--r-- | e-util/e-table-utils.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/e-util/e-table-utils.c b/e-util/e-table-utils.c index 3c598e38a9..040e5d3e07 100644 --- a/e-util/e-table-utils.c +++ b/e-util/e-table-utils.c @@ -39,8 +39,7 @@ e_table_state_to_header (GtkWidget *widget, ETableState *state) { ETableHeader *nh; - const gint max_cols = e_table_header_count (full_header); - gint column; + gint ii; GValue *val = g_new0 (GValue, 1); g_return_val_if_fail (widget, NULL); @@ -53,21 +52,17 @@ e_table_state_to_header (GtkWidget *widget, g_object_set_property (G_OBJECT (nh), "width_extras", val); g_free (val); - for (column = 0; column < state->col_count; column++) { - gint col; - gdouble expansion; + for (ii = 0; ii < state->col_count; ii++) { ETableCol *table_col; - col = state->columns[column]; - expansion = state->expansions[column]; + table_col = e_table_header_get_column_by_spec ( + full_header, state->column_specs[ii]); - if (col >= max_cols) + if (table_col == NULL) continue; - table_col = e_table_header_get_column (full_header, col); - - if (expansion >= -1) - table_col->expansion = expansion; + if (state->expansions[ii] >= -1) + table_col->expansion = state->expansions[ii]; e_table_header_add_column (nh, table_col, -1); } |