From 5eb2c54d03cc68790ce86b2dc5a40d3a42ccfdc2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 15 Jun 2013 11:20:41 -0400 Subject: Remove unused e_tree_model_node_col_changed(). --- e-util/e-tree-model.c | 32 -------------------------------- e-util/e-tree-model.h | 6 ------ e-util/e-tree-selection-model.c | 17 ----------------- e-util/e-tree-table-adapter.c | 22 ---------------------- 4 files changed, 77 deletions(-) (limited to 'e-util') diff --git a/e-util/e-tree-model.c b/e-util/e-tree-model.c index 7c3fdeab61..f51c31f66f 100644 --- a/e-util/e-tree-model.c +++ b/e-util/e-tree-model.c @@ -49,7 +49,6 @@ enum { PRE_CHANGE, NODE_CHANGED, NODE_DATA_CHANGED, - NODE_COL_CHANGED, NODE_INSERTED, NODE_REMOVED, NODE_DELETED, @@ -103,17 +102,6 @@ e_tree_model_class_init (ETreeModelClass *class) G_TYPE_NONE, 1, G_TYPE_POINTER); - signals[NODE_COL_CHANGED] = g_signal_new ( - "node_col_changed", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (ETreeModelClass, node_col_changed), - (GSignalAccumulator) NULL, NULL, - e_marshal_VOID__POINTER_INT, - G_TYPE_NONE, 2, - G_TYPE_POINTER, - G_TYPE_INT); - signals[NODE_INSERTED] = g_signal_new ( "node_inserted", G_TYPE_FROM_CLASS (object_class), @@ -195,7 +183,6 @@ e_tree_model_class_init (ETreeModelClass *class) class->rebuilt = NULL; class->node_changed = NULL; class->node_data_changed = NULL; - class->node_col_changed = NULL; class->node_inserted = NULL; class->node_removed = NULL; class->node_deleted = NULL; @@ -273,25 +260,6 @@ e_tree_model_node_data_changed (ETreeModel *tree_model, g_signal_emit (tree_model, signals[NODE_DATA_CHANGED], 0, path); } -/** - * e_tree_model_node_col_changed: - * @tree_model: - * @path: - * - * - * - * Return value: - **/ -void -e_tree_model_node_col_changed (ETreeModel *tree_model, - ETreePath path, - gint col) -{ - g_return_if_fail (E_IS_TREE_MODEL (tree_model)); - - g_signal_emit (tree_model, signals[NODE_COL_CHANGED], 0, path, col); -} - /** * e_tree_model_node_inserted: * @tree_model: diff --git a/e-util/e-tree-model.h b/e-util/e-tree-model.h index 9a73518b1c..173d53d2f0 100644 --- a/e-util/e-tree-model.h +++ b/e-util/e-tree-model.h @@ -152,9 +152,6 @@ struct _ETreeModelClass { ETreePath path); void (*node_data_changed) (ETreeModel *tree_model, ETreePath path); - void (*node_col_changed) (ETreeModel *tree_model, - ETreePath path, - gint col); void (*node_inserted) (ETreeModel *tree_model, ETreePath parent, ETreePath inserted_path); @@ -257,9 +254,6 @@ void e_tree_model_node_changed (ETreeModel *tree_model, ETreePath path); void e_tree_model_node_data_changed (ETreeModel *tree_model, ETreePath path); -void e_tree_model_node_col_changed (ETreeModel *tree_model, - ETreePath path, - gint col); void e_tree_model_node_inserted (ETreeModel *tree_model, ETreePath parent_path, ETreePath inserted_path); diff --git a/e-util/e-tree-selection-model.c b/e-util/e-tree-selection-model.c index 9a1cda7b35..b59c770f12 100644 --- a/e-util/e-tree-selection-model.c +++ b/e-util/e-tree-selection-model.c @@ -59,7 +59,6 @@ struct _ETreeSelectionModelPrivate { gint tree_model_pre_change_id; gint tree_model_node_changed_id; gint tree_model_node_data_changed_id; - gint tree_model_node_col_changed_id; gint tree_model_node_inserted_id; gint tree_model_node_removed_id; gint tree_model_node_deleted_id; @@ -198,15 +197,6 @@ etsm_node_data_changed (ETreeModel *etm, free_id (etsm); } -static void -etsm_node_col_changed (ETreeModel *etm, - ETreePath node, - gint col, - ETreeSelectionModel *etsm) -{ - free_id (etsm); -} - static void etsm_node_inserted (ETreeModel *etm, ETreePath parent, @@ -259,10 +249,6 @@ add_model (ETreeSelectionModel *etsm, priv->model, "node_data_changed", G_CALLBACK (etsm_node_data_changed), etsm); - priv->tree_model_node_col_changed_id = g_signal_connect_after ( - priv->model, "node_col_changed", - G_CALLBACK (etsm_node_col_changed), etsm); - priv->tree_model_node_inserted_id = g_signal_connect_after ( priv->model, "node_inserted", G_CALLBACK (etsm_node_inserted), etsm); @@ -290,8 +276,6 @@ drop_model (ETreeSelectionModel *etsm) priv->model, priv->tree_model_node_changed_id); g_signal_handler_disconnect ( priv->model, priv->tree_model_node_data_changed_id); - g_signal_handler_disconnect ( - priv->model, priv->tree_model_node_col_changed_id); g_signal_handler_disconnect ( priv->model, priv->tree_model_node_inserted_id); g_signal_handler_disconnect ( @@ -305,7 +289,6 @@ drop_model (ETreeSelectionModel *etsm) priv->tree_model_pre_change_id = 0; priv->tree_model_node_changed_id = 0; priv->tree_model_node_data_changed_id = 0; - priv->tree_model_node_col_changed_id = 0; priv->tree_model_node_inserted_id = 0; priv->tree_model_node_removed_id = 0; priv->tree_model_node_deleted_id = 0; diff --git a/e-util/e-tree-table-adapter.c b/e-util/e-tree-table-adapter.c index c0fe6af136..ddb439f98d 100644 --- a/e-util/e-tree-table-adapter.c +++ b/e-util/e-tree-table-adapter.c @@ -89,7 +89,6 @@ struct _ETreeTableAdapterPrivate { gint rebuilt_id; gint node_changed_id; gint node_data_changed_id; - gint node_col_changed_id; gint node_inserted_id; gint node_removed_id; gint node_request_collapse_id; @@ -588,8 +587,6 @@ etta_dispose (GObject *object) priv->source, priv->node_changed_id); g_signal_handler_disconnect ( priv->source, priv->node_data_changed_id); - g_signal_handler_disconnect ( - priv->source, priv->node_col_changed_id); g_signal_handler_disconnect ( priv->source, priv->node_inserted_id); g_signal_handler_disconnect ( @@ -854,22 +851,6 @@ etta_proxy_node_data_changed (ETreeModel *etm, e_table_model_row_changed (E_TABLE_MODEL (etta), row); } -static void -etta_proxy_node_col_changed (ETreeModel *etm, - ETreePath path, - gint col, - ETreeTableAdapter *etta) -{ - gint row = get_row (etta, path); - - if (row == -1) { - e_table_model_no_change (E_TABLE_MODEL (etta)); - return; - } - - e_table_model_cell_changed (E_TABLE_MODEL (etta), col, row); -} - static void etta_proxy_node_inserted (ETreeModel *etm, ETreePath parent, @@ -969,9 +950,6 @@ e_tree_table_adapter_construct (ETreeTableAdapter *etta, etta->priv->node_data_changed_id = g_signal_connect ( source, "node_data_changed", G_CALLBACK (etta_proxy_node_data_changed), etta); - etta->priv->node_col_changed_id = g_signal_connect ( - source, "node_col_changed", - G_CALLBACK (etta_proxy_node_col_changed), etta); etta->priv->node_inserted_id = g_signal_connect ( source, "node_inserted", G_CALLBACK (etta_proxy_node_inserted), etta); -- cgit v1.2.3