From a513a5f502e7d1d89e6294c3afa4ea20af50edb5 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Mon, 17 Sep 2001 03:57:12 +0000 Subject: Bumped version number to 0.11.99.4. 2001-09-16 Christopher James Lahey * configure.in: Bumped version number to 0.11.99.4. * gal/e-text/e-completion-view.c (e_completion_view_construct), tests/test-table-1.c (create_table): Changed the parameters to e_table_simple_new here to adjust to changes in the interface. * gal/widgets/e-categories-master-list-array.c (ecmla_default): Fixed a memory leak here. * gal/widgets/e-categories.c (e_categories_get_save_id): Added get_save_id here so that selection would be maintained across changes. From gal/e-table/ChangeLog: 2001-09-16 Christopher James Lahey * e-table-model.c, e-table-model.h (e_table_model_class_init): Rearranged order of has_save_id and get_save_id to be more consistent with ETree. * e-table-selection-model.c, e-table-selection-model.h: Turned on the code to maintain selection and cursor across changes if the model supports get_save_id. * e-table-simple.c, e-table-simple.h: Changed this interface to take all of the ETableModel functions in the _new function. * e-table-subset.c (etss_has_save_id, etss_get_save_id): Added these to properly proxy the save_id functionality. * e-tree-memory-callbacks.c, e-tree-memory-callbacks.h, e-tree-model.c, e-tree-model.h, e-tree-sorted.c: Made the save_id parameter to get_node_by_id be const char * instead of char *. * e-tree-table-adapter.c (etta_class_init): Rearranged some assignments here to be more consistent. svn path=/trunk/; revision=12869 --- widgets/table/e-table-model.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'widgets/table/e-table-model.c') diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c index 9429aeb0f9..9a0b3561dd 100644 --- a/widgets/table/e-table-model.c +++ b/widgets/table/e-table-model.c @@ -171,20 +171,8 @@ e_table_model_free_value (ETableModel *e_table_model, int col, void *value) ETM_CLASS (e_table_model)->free_value (e_table_model, col, value); } -char * -e_table_model_get_save_id(ETableModel *e_table_model, int row) -{ - g_return_val_if_fail (e_table_model != NULL, "/"); - g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), "/"); - - if (ETM_CLASS (e_table_model)->get_save_id) - return ETM_CLASS (e_table_model)->get_save_id (e_table_model, row); - else - return NULL; -} - gboolean -e_table_model_has_save_id(ETableModel *e_table_model) +e_table_model_has_save_id (ETableModel *e_table_model) { g_return_val_if_fail (e_table_model != NULL, FALSE); g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), FALSE); @@ -195,6 +183,18 @@ e_table_model_has_save_id(ETableModel *e_table_model) return FALSE; } +char * +e_table_model_get_save_id (ETableModel *e_table_model, int row) +{ + g_return_val_if_fail (e_table_model != NULL, "/"); + g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), "/"); + + if (ETM_CLASS (e_table_model)->get_save_id) + return ETM_CLASS (e_table_model)->get_save_id (e_table_model, row); + else + return NULL; +} + gboolean e_table_model_has_change_pending(ETableModel *e_table_model) { @@ -316,8 +316,8 @@ e_table_model_class_init (GtkObjectClass *object_class) klass->set_value_at = NULL; klass->is_cell_editable = NULL; - klass->get_save_id = NULL; klass->has_save_id = NULL; + klass->get_save_id = NULL; klass->has_change_pending = NULL; -- cgit