diff options
Diffstat (limited to 'widgets')
-rw-r--r-- | widgets/e-table/ChangeLog | 5 | ||||
-rw-r--r-- | widgets/e-table/e-table-text-model.c | 3 | ||||
-rw-r--r-- | widgets/table/e-table-text-model.c | 3 | ||||
-rw-r--r-- | widgets/text/e-table-text-model.c | 3 |
4 files changed, 8 insertions, 6 deletions
diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog index bba0fad29c..b96f8c07df 100644 --- a/widgets/e-table/ChangeLog +++ b/widgets/e-table/ChangeLog @@ -1,3 +1,8 @@ +2000-03-28 Matt Loper <matt@helixcode.com> + + * e-table-text-model.c (e_table_text_model_destroy): made + assertion more accurate. + 2000-03-27 Michael Meeks <michael@helixcode.com> * e-table-item.c (eti_update): try and fix the convoluted logic. diff --git a/widgets/e-table/e-table-text-model.c b/widgets/e-table/e-table-text-model.c index 37c13080a7..13d0071cc6 100644 --- a/widgets/e-table/e-table-text-model.c +++ b/widgets/e-table/e-table-text-model.c @@ -109,8 +109,7 @@ e_table_text_model_destroy (GtkObject *object) model = E_TABLE_TEXT_MODEL (object); - g_assert (model->model); - g_assert (GTK_IS_OBJECT (model->model)); + g_assert (!model->model || GTK_IS_OBJECT (model->model)); if (model->cell_changed_signal_id) gtk_signal_disconnect(GTK_OBJECT(model->model), diff --git a/widgets/table/e-table-text-model.c b/widgets/table/e-table-text-model.c index 37c13080a7..13d0071cc6 100644 --- a/widgets/table/e-table-text-model.c +++ b/widgets/table/e-table-text-model.c @@ -109,8 +109,7 @@ e_table_text_model_destroy (GtkObject *object) model = E_TABLE_TEXT_MODEL (object); - g_assert (model->model); - g_assert (GTK_IS_OBJECT (model->model)); + g_assert (!model->model || GTK_IS_OBJECT (model->model)); if (model->cell_changed_signal_id) gtk_signal_disconnect(GTK_OBJECT(model->model), diff --git a/widgets/text/e-table-text-model.c b/widgets/text/e-table-text-model.c index 37c13080a7..13d0071cc6 100644 --- a/widgets/text/e-table-text-model.c +++ b/widgets/text/e-table-text-model.c @@ -109,8 +109,7 @@ e_table_text_model_destroy (GtkObject *object) model = E_TABLE_TEXT_MODEL (object); - g_assert (model->model); - g_assert (GTK_IS_OBJECT (model->model)); + g_assert (!model->model || GTK_IS_OBJECT (model->model)); if (model->cell_changed_signal_id) gtk_signal_disconnect(GTK_OBJECT(model->model), |