diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/gui/e-cal-model-tasks.c | 9 | ||||
| -rw-r--r-- | calendar/gui/e-cal-model.c | 4 |
3 files changed, 15 insertions, 6 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index e07b78043b..29ddca2cea 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2004-05-07 JP Rosevear <jpr@ximian.com> + + * gui/e-cal-model.c (ecm_is_cell_editable): fix comment and check + + * gui/e-cal-model-tasks.c (ecmt_set_value_at): set a parent field + properly + (ecmt_is_cell_editable): fix comment and check + 2004-05-06 Larry Ewing <lewing@ximian.com> * gui/dialogs/calendar-setup.c (source_to_dialog): use random diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c index 8128c40d76..5067e2557d 100644 --- a/calendar/gui/e-cal-model-tasks.c +++ b/calendar/gui/e-cal-model-tasks.c @@ -758,6 +758,11 @@ ecmt_set_value_at (ETableModel *etm, int col, int row, const void *value) g_return_if_fail (col >= 0 && col < E_CAL_MODEL_TASKS_FIELD_LAST); g_return_if_fail (row >= 0 && row < e_table_model_row_count (etm)); + if (col < E_CAL_MODEL_FIELD_LAST) { + E_TABLE_MODEL_CLASS (parent_class)->set_value_at (etm, col, row, value); + return; + } + comp_data = e_cal_model_get_component_at (E_CAL_MODEL (model), row); if (!comp_data) return; @@ -808,9 +813,7 @@ ecmt_is_cell_editable (ETableModel *etm, int col, int row) priv = model->priv; g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_TASKS_FIELD_LAST, FALSE); - - /* FIXME: We can't check this as 'click-to-add' passes row 0. */ - /* g_return_val_if_fail (row >= 0 && row < e_table_model_get_row_count (etm), FALSE); */ + g_return_val_if_fail (row >= -1 && row < e_table_model_get_row_count (etm), FALSE); if (col < E_CAL_MODEL_FIELD_LAST) return E_TABLE_MODEL_CLASS (parent_class)->is_cell_editable (etm, col, row); diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index 25a866db3a..ca3ca1e863 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -671,9 +671,7 @@ ecm_is_cell_editable (ETableModel *etm, int col, int row) priv = model->priv; g_return_val_if_fail (col >= 0 && col <= E_CAL_MODEL_FIELD_LAST, FALSE); - - /* FIXME: We can't check this as 'click-to-add' passes row 0. */ - /*g_return_val_if_fail (row >= 0 && row < priv->objects->len, FALSE);*/ + g_return_val_if_fail (row >= -1 && row < priv->objects->len, FALSE); switch (col) { case E_CAL_MODEL_FIELD_CATEGORIES : |