diff options
| -rw-r--r-- | doc/reference/evolution-util/evolution-util-sections.txt | 1 | ||||
| -rw-r--r-- | e-util/e-tree-model.c | 21 | ||||
| -rw-r--r-- | e-util/e-tree-model.h | 2 | ||||
| -rw-r--r-- | e-util/e-tree-selection-model.c | 1 | ||||
| -rw-r--r-- | e-util/e-tree-table-adapter.c | 4 | ||||
| -rw-r--r-- | e-util/e-tree.c | 3 | ||||
| -rw-r--r-- | mail/message-list.c | 7 |
7 files changed, 2 insertions, 37 deletions
diff --git a/doc/reference/evolution-util/evolution-util-sections.txt b/doc/reference/evolution-util/evolution-util-sections.txt index b31f49d133..b8f1f798c1 100644 --- a/doc/reference/evolution-util/evolution-util-sections.txt +++ b/doc/reference/evolution-util/evolution-util-sections.txt @@ -4295,7 +4295,6 @@ e_tree_model_node_get_n_children e_tree_model_node_depth e_tree_model_get_expanded_default e_tree_model_column_count -e_tree_model_has_save_id e_tree_model_get_save_id e_tree_model_has_get_node_by_id e_tree_model_get_node_by_id diff --git a/e-util/e-tree-model.c b/e-util/e-tree-model.c index 6c41d8003e..881e82eb08 100644 --- a/e-util/e-tree-model.c +++ b/e-util/e-tree-model.c @@ -438,27 +438,6 @@ e_tree_model_column_count (ETreeModel *tree_model) } /** - * e_tree_model_has_save_id - * @tree_model: The ETreeModel. - * - * XXX docs here. - * - * return values: Whether this tree has valid save id data. - */ -gboolean -e_tree_model_has_save_id (ETreeModel *tree_model) -{ - ETreeModelInterface *interface; - - g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), FALSE); - - interface = E_TREE_MODEL_GET_INTERFACE (tree_model); - g_return_val_if_fail (interface->has_save_id != NULL, FALSE); - - return interface->has_save_id (tree_model); -} - -/** * e_tree_model_get_save_id * @tree_model: The ETreeModel. * @path: The ETreePath. diff --git a/e-util/e-tree-model.h b/e-util/e-tree-model.h index fd54b81f10..4771304512 100644 --- a/e-util/e-tree-model.h +++ b/e-util/e-tree-model.h @@ -73,7 +73,6 @@ struct _ETreeModelInterface { gboolean (*get_expanded_default) (ETreeModel *tree_model); gint (*column_count) (ETreeModel *tree_model); - gboolean (*has_save_id) (ETreeModel *tree_model); gchar * (*get_save_id) (ETreeModel *tree_model, ETreePath path); @@ -164,7 +163,6 @@ guint e_tree_model_node_depth (ETreeModel *tree_model, gboolean e_tree_model_get_expanded_default (ETreeModel *tree_model); gint e_tree_model_column_count (ETreeModel *tree_model); -gboolean e_tree_model_has_save_id (ETreeModel *tree_model); gchar * e_tree_model_get_save_id (ETreeModel *tree_model, ETreePath path); gboolean e_tree_model_has_get_node_by_id (ETreeModel *tree_model); diff --git a/e-util/e-tree-selection-model.c b/e-util/e-tree-selection-model.c index b59c770f12..208d6aefb5 100644 --- a/e-util/e-tree-selection-model.c +++ b/e-util/e-tree-selection-model.c @@ -174,7 +174,6 @@ etsm_pre_change (ETreeModel *etm, etsm->priv->cursor_save_id = NULL; if (e_tree_model_has_get_node_by_id (etm) && - e_tree_model_has_save_id (etm) && etsm->priv->cursor_path) { etsm->priv->cursor_save_id = e_tree_model_get_save_id ( etm, etsm->priv->cursor_path); diff --git a/e-util/e-tree-table-adapter.c b/e-util/e-tree-table-adapter.c index 6a17d6623e..9262b40800 100644 --- a/e-util/e-tree-table-adapter.c +++ b/e-util/e-tree-table-adapter.c @@ -610,9 +610,7 @@ etta_column_count (ETableModel *etm) static gboolean etta_has_save_id (ETableModel *etm) { - ETreeTableAdapter *etta = (ETreeTableAdapter *) etm; - - return e_tree_model_has_save_id (etta->priv->source); + return TRUE; } static gchar * diff --git a/e-util/e-tree.c b/e-util/e-tree.c index 4ea3a4ae43..d5ec5acc4c 100644 --- a/e-util/e-tree.c +++ b/e-util/e-tree.c @@ -3175,8 +3175,7 @@ hover_timeout (gpointer data) path = e_tree_table_adapter_node_at_row (et->priv->etta, row); if (path && e_tree_model_node_is_expandable (et->priv->model, path)) { if (!e_tree_table_adapter_node_is_expanded (et->priv->etta, path)) { - if (e_tree_model_has_save_id (et->priv->model) && - e_tree_model_has_get_node_by_id (et->priv->model)) + if (e_tree_model_has_get_node_by_id (et->priv->model)) et->priv->expanded_list = g_list_prepend ( et->priv->expanded_list, e_tree_model_get_save_id ( diff --git a/mail/message-list.c b/mail/message-list.c index 3350f97e41..e95034aef5 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -2679,12 +2679,6 @@ message_list_column_count (ETreeModel *tree_model) return COL_LAST; } -static gboolean -message_list_has_save_id (ETreeModel *tree_model) -{ - return TRUE; -} - static gchar * message_list_get_save_id (ETreeModel *tree_model, ETreePath path) @@ -3135,7 +3129,6 @@ message_list_tree_model_init (ETreeModelInterface *interface) interface->depth = message_list_depth; interface->get_expanded_default = message_list_get_expanded_default; interface->column_count = message_list_column_count; - interface->has_save_id = message_list_has_save_id; interface->get_save_id = message_list_get_save_id; interface->has_get_node_by_id = message_list_has_get_node_by_id; interface->get_node_by_id = message_list_get_node_by_id; |