diff options
Diffstat (limited to 'e-util/e-table-one.c')
| -rw-r--r-- | e-util/e-table-one.c | 149 |
1 files changed, 72 insertions, 77 deletions
diff --git a/e-util/e-table-one.c b/e-util/e-table-one.c index db9c27e4d1..242484fdfa 100644 --- a/e-util/e-table-one.c +++ b/e-util/e-table-one.c @@ -27,10 +27,39 @@ #include "e-table-one.h" -G_DEFINE_TYPE (ETableOne, e_table_one, E_TYPE_TABLE_MODEL) +G_DEFINE_TYPE ( + ETableOne, + e_table_one, + E_TYPE_TABLE_MODEL) + +static void +table_one_dispose (GObject *object) +{ + ETableOne *one = E_TABLE_ONE (object); + + if (one->data) { + gint i; + gint col_count; + + if (one->source) { + col_count = e_table_model_column_count (one->source); + + for (i = 0; i < col_count; i++) + e_table_model_free_value (one->source, i, one->data[i]); + } + + g_free (one->data); + } + one->data = NULL; + + g_clear_object (&one->source); + + /* Chain up to parent's dispose() method. */ + G_OBJECT_CLASS (e_table_one_parent_class)->dispose (object); +} static gint -one_column_count (ETableModel *etm) +table_one_column_count (ETableModel *etm) { ETableOne *one = E_TABLE_ONE (etm); @@ -41,15 +70,15 @@ one_column_count (ETableModel *etm) } static gint -one_row_count (ETableModel *etm) +table_one_row_count (ETableModel *etm) { return 1; } static gpointer -one_value_at (ETableModel *etm, - gint col, - gint row) +table_one_value_at (ETableModel *etm, + gint col, + gint row) { ETableOne *one = E_TABLE_ONE (etm); @@ -60,10 +89,10 @@ one_value_at (ETableModel *etm, } static void -one_set_value_at (ETableModel *etm, - gint col, - gint row, - gconstpointer val) +table_one_set_value_at (ETableModel *etm, + gint col, + gint row, + gconstpointer val) { ETableOne *one = E_TABLE_ONE (etm); @@ -74,9 +103,9 @@ one_set_value_at (ETableModel *etm, } static gboolean -one_is_cell_editable (ETableModel *etm, - gint col, - gint row) +table_one_is_cell_editable (ETableModel *etm, + gint col, + gint row) { ETableOne *one = E_TABLE_ONE (etm); @@ -88,9 +117,9 @@ one_is_cell_editable (ETableModel *etm, /* The default for one_duplicate_value is to return the raw value. */ static gpointer -one_duplicate_value (ETableModel *etm, - gint col, - gconstpointer value) +table_one_duplicate_value (ETableModel *etm, + gint col, + gconstpointer value) { ETableOne *one = E_TABLE_ONE (etm); @@ -101,9 +130,9 @@ one_duplicate_value (ETableModel *etm, } static void -one_free_value (ETableModel *etm, - gint col, - gpointer value) +table_one_free_value (ETableModel *etm, + gint col, + gpointer value) { ETableOne *one = E_TABLE_ONE (etm); @@ -112,8 +141,8 @@ one_free_value (ETableModel *etm, } static gpointer -one_initialize_value (ETableModel *etm, - gint col) +table_one_initialize_value (ETableModel *etm, + gint col) { ETableOne *one = E_TABLE_ONE (etm); @@ -124,9 +153,9 @@ one_initialize_value (ETableModel *etm, } static gboolean -one_value_is_empty (ETableModel *etm, - gint col, - gconstpointer value) +table_one_value_is_empty (ETableModel *etm, + gint col, + gconstpointer value) { ETableOne *one = E_TABLE_ONE (etm); @@ -137,9 +166,9 @@ one_value_is_empty (ETableModel *etm, } static gchar * -one_value_to_string (ETableModel *etm, - gint col, - gconstpointer value) +table_one_value_to_string (ETableModel *etm, + gint col, + gconstpointer value) { ETableOne *one = E_TABLE_ONE (etm); @@ -150,64 +179,30 @@ one_value_to_string (ETableModel *etm, } static void -one_finalize (GObject *object) -{ - G_OBJECT_CLASS (e_table_one_parent_class)->finalize (object); -} - -static void -one_dispose (GObject *object) +e_table_one_class_init (ETableOneClass *class) { - ETableOne *one = E_TABLE_ONE (object); - - if (one->data) { - gint i; - gint col_count; - - if (one->source) { - col_count = e_table_model_column_count (one->source); - - for (i = 0; i < col_count; i++) - e_table_model_free_value (one->source, i, one->data[i]); - } - - g_free (one->data); - } - one->data = NULL; - - if (one->source) - g_object_unref (one->source); - one->source = NULL; + GObjectClass *object_class; + ETableModelClass *model_class; - G_OBJECT_CLASS (e_table_one_parent_class)->dispose (object); -} + object_class = G_OBJECT_CLASS (class); + object_class->dispose = table_one_dispose; -static void -e_table_one_class_init (ETableOneClass *class) -{ - GObjectClass *object_class = G_OBJECT_CLASS (class); - ETableModelClass *model_class = E_TABLE_MODEL_CLASS (class); - - model_class->column_count = one_column_count; - model_class->row_count = one_row_count; - model_class->value_at = one_value_at; - model_class->set_value_at = one_set_value_at; - model_class->is_cell_editable = one_is_cell_editable; - model_class->duplicate_value = one_duplicate_value; - model_class->free_value = one_free_value; - model_class->initialize_value = one_initialize_value; - model_class->value_is_empty = one_value_is_empty; - model_class->value_to_string = one_value_to_string; - - object_class->dispose = one_dispose; - object_class->finalize = one_finalize; + model_class = E_TABLE_MODEL_CLASS (class); + model_class->column_count = table_one_column_count; + model_class->row_count = table_one_row_count; + model_class->value_at = table_one_value_at; + model_class->set_value_at = table_one_set_value_at; + model_class->is_cell_editable = table_one_is_cell_editable; + model_class->duplicate_value = table_one_duplicate_value; + model_class->free_value = table_one_free_value; + model_class->initialize_value = table_one_initialize_value; + model_class->value_is_empty = table_one_value_is_empty; + model_class->value_to_string = table_one_value_to_string; } static void e_table_one_init (ETableOne *one) { - one->source = NULL; - one->data = NULL; } ETableModel * |