From 9de25e88aa7b0d125739fda6bbbfdb4ebe16f951 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Tue, 13 Jun 2000 00:41:47 +0000 Subject: Removed the freeze/thaw stuff for the model. As Chris wisely pointed out, 2000-06-12 Federico Mena Quintero * e-table-model.[ch]: Removed the freeze/thaw stuff for the model. As Chris wisely pointed out, having freeze/thaw on the model makes its state inconsistent from the perspective of the views. * e-table-sorted-variable.c: Do not check for a frozen model. * e-table-subset.c: Likewise. * e-table-subset-variable.c: Likewise. * e-table-example-1.c: Removed the ETableModel thaw handler. * e-table-example-2.c: Likewise. * e-table-simple.c: Likewise. * e-table-size-test.c: Likewise. * test-check.c: Likewise. * test-cols.c: Likewise. * test-table.c: Likewise. svn path=/trunk/; revision=3543 --- widgets/table/e-table-sorted-variable.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) (limited to 'widgets/table/e-table-sorted-variable.c') diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c index f7719df3c1..4f2985edc6 100644 --- a/widgets/table/e-table-sorted-variable.c +++ b/widgets/table/e-table-sorted-variable.c @@ -159,8 +159,8 @@ etsv_add (ETableSubsetVariable *etssv, } etss->map_table[i] = row; etss->n_map++; - if (!etm->frozen) - e_table_model_row_inserted (etm, i); + + e_table_model_row_inserted (etm, i); } static void @@ -182,8 +182,8 @@ etsv_add_all (ETableSubsetVariable *etssv) if (etsv->sort_idle_id == 0) { etsv->sort_idle_id = g_idle_add_full(50, (GSourceFunc) etsv_sort_idle, etsv, NULL); } - if (!etm->frozen) - e_table_model_changed (etm); + + e_table_model_changed (etm); } ETableModel * @@ -217,29 +217,25 @@ e_table_sorted_variable_new (ETableModel *source, ETableHeader *full_header, ETa static void etsv_proxy_model_changed (ETableModel *etm, ETableSortedVariable *etsv) { - if (!E_TABLE_MODEL(etsv)->frozen){ - /* FIXME: do_resort (); */ - } + /* FIXME: do_resort (); */ } static void etsv_proxy_model_row_changed (ETableModel *etm, int row, ETableSortedVariable *etsv) { ETableSubsetVariable *etssv = E_TABLE_SUBSET_VARIABLE(etsv); - if (!E_TABLE_MODEL(etsv)->frozen){ - if (e_table_subset_variable_remove(etssv, row)) - e_table_subset_variable_add (etssv, row); - } + + if (e_table_subset_variable_remove(etssv, row)) + e_table_subset_variable_add (etssv, row); } static void etsv_proxy_model_cell_changed (ETableModel *etm, int col, int row, ETableSortedVariable *etsv) { ETableSubsetVariable *etssv = E_TABLE_SUBSET_VARIABLE(etsv); - if (!E_TABLE_MODEL(etsv)->frozen){ - if (e_table_subset_variable_remove(etssv, row)) - e_table_subset_variable_add (etssv, row); - } + + if (e_table_subset_variable_remove(etssv, row)) + e_table_subset_variable_add (etssv, row); } static void -- cgit v1.2.3