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-field-chooser-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/e-table-field-chooser-item.c')
| -rw-r--r-- | e-util/e-table-field-chooser-item.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/e-util/e-table-field-chooser-item.c b/e-util/e-table-field-chooser-item.c index f4a85d6b83..592349ae57 100644 --- a/e-util/e-table-field-chooser-item.c +++ b/e-util/e-table-field-chooser-item.c @@ -100,7 +100,7 @@ etfci_find_button (ETableFieldChooserItem *etfci, ETableCol *ecol; ecol = e_table_header_get_column (etfci->combined_header, i); - if (ecol->disabled) + if (ecol->spec->disabled) continue; height += e_table_header_compute_height ( ecol, GTK_WIDGET (GNOME_CANVAS_ITEM (etfci)->canvas)); @@ -127,9 +127,10 @@ etfci_rebuild_combined (ETableFieldChooserItem *etfci) count = e_table_header_count (etfci->header); for (i = 0; i < count; i++) { ETableCol *ecol = e_table_header_get_column (etfci->header, i); - if (ecol->disabled) + if (ecol->spec->disabled) continue; - g_hash_table_add (hash, GINT_TO_POINTER (ecol->col_idx)); + g_hash_table_add ( + hash, GINT_TO_POINTER (ecol->spec->model_col)); } count = e_table_header_count (etfci->full_header); @@ -138,9 +139,9 @@ etfci_rebuild_combined (ETableFieldChooserItem *etfci) gpointer key; ecol = e_table_header_get_column (etfci->full_header, i); - key = GINT_TO_POINTER (ecol->col_idx); + key = GINT_TO_POINTER (ecol->spec->model_col); - if (ecol->disabled) + if (ecol->spec->disabled) continue; if (!g_hash_table_contains (hash, key)) @@ -170,7 +171,7 @@ etfci_reflow (GnomeCanvasItem *item, ETableCol *ecol; ecol = e_table_header_get_column (etfci->combined_header, i); - if (ecol->disabled) + if (ecol->spec->disabled) continue; height += e_table_header_compute_height ( ecol, GTK_WIDGET (GNOME_CANVAS_ITEM (etfci)->canvas)); @@ -509,7 +510,7 @@ etfci_draw (GnomeCanvasItem *item, ecol = e_table_header_get_column (etfci->combined_header, row); - if (ecol->disabled) + if (ecol->spec->disabled) continue; y2 += e_table_header_compute_height (ecol, GTK_WIDGET (canvas)); @@ -588,10 +589,10 @@ etfci_start_drag (ETableFieldChooserItem *etfci, ecol = e_table_header_get_column (etfci->combined_header, drag_col); - if (ecol->disabled) + if (ecol->spec->disabled) return; - etfci->drag_col = ecol->col_idx; + etfci->drag_col = ecol->spec->model_col; etfci_drag_types[0].target = g_strdup_printf ( "%s-%s", etfci_drag_types[0].target, etfci->dnd_code); |