diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-06-18 21:25:40 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-06-19 08:31:50 +0800 |
| commit | c6ccd45a0ef07b12a0313deb3abee032d89eec0a (patch) | |
| tree | 41f67ea66ada4bf9a1b109236194386dc1292f7e /e-util/e-table-subset-variable.c | |
| parent | 96acf4fa41260e7917ae1a794bb4b636e6c398cc (diff) | |
| download | gsoc2013-evolution-c6ccd45a0ef07b12a0313deb3abee032d89eec0a.tar gsoc2013-evolution-c6ccd45a0ef07b12a0313deb3abee032d89eec0a.tar.gz gsoc2013-evolution-c6ccd45a0ef07b12a0313deb3abee032d89eec0a.tar.bz2 gsoc2013-evolution-c6ccd45a0ef07b12a0313deb3abee032d89eec0a.tar.lz gsoc2013-evolution-c6ccd45a0ef07b12a0313deb3abee032d89eec0a.tar.xz gsoc2013-evolution-c6ccd45a0ef07b12a0313deb3abee032d89eec0a.tar.zst gsoc2013-evolution-c6ccd45a0ef07b12a0313deb3abee032d89eec0a.zip | |
ETable-related cleanups.
Diffstat (limited to 'e-util/e-table-subset-variable.c')
| -rw-r--r-- | e-util/e-table-subset-variable.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/e-util/e-table-subset-variable.c b/e-util/e-table-subset-variable.c index 8d9f3d0c8d..4750f168fa 100644 --- a/e-util/e-table-subset-variable.c +++ b/e-util/e-table-subset-variable.c @@ -31,9 +31,10 @@ #define ETSSV_CLASS(e) (E_TABLE_SUBSET_VARIABLE_GET_CLASS (e)) -/* workaround for avoiding API breakage */ -#define etssv_get_type e_table_subset_variable_get_type -G_DEFINE_TYPE (ETableSubsetVariable, etssv, E_TYPE_TABLE_SUBSET) +G_DEFINE_TYPE ( + ETableSubsetVariable, + e_table_subset_variable, + E_TYPE_TABLE_SUBSET) #define INCREMENT_AMOUNT 10 @@ -86,12 +87,15 @@ etssv_add_all (ETableSubsetVariable *etssv) { ETableModel *etm = E_TABLE_MODEL (etssv); ETableSubset *etss = E_TABLE_SUBSET (etssv); + ETableModel *source_model; gint rows; gint i; e_table_model_pre_change (etm); - rows = e_table_model_row_count (etss->source); + source_model = e_table_subset_get_source_model (etss); + rows = e_table_model_row_count (source_model); + if (etss->n_map + rows > etssv->n_vals_allocated) { etssv->n_vals_allocated += MAX (INCREMENT_AMOUNT, rows); etss->map_table = g_realloc ( @@ -129,7 +133,7 @@ etssv_remove (ETableSubsetVariable *etssv, } static void -etssv_class_init (ETableSubsetVariableClass *class) +e_table_subset_variable_class_init (ETableSubsetVariableClass *class) { class->add = etssv_add; class->add_array = etssv_add_array; @@ -138,7 +142,7 @@ etssv_class_init (ETableSubsetVariableClass *class) } static void -etssv_init (ETableSubsetVariable *etssv) +e_table_subset_variable_init (ETableSubsetVariable *etssv) { /* nothing to do */ } |