aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-06-16 08:13:11 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-06-16 08:13:11 +0800
commit6ee6427afd6d158c62563c0f1bf6ba2067460dca (patch)
tree2b1df2053d174b2726365a042328cf29c4d9bf4c /e-util
parent5e8195693beefe391f49a860b206893aedd1338c (diff)
downloadgsoc2013-evolution-6ee6427afd6d158c62563c0f1bf6ba2067460dca.tar
gsoc2013-evolution-6ee6427afd6d158c62563c0f1bf6ba2067460dca.tar.gz
gsoc2013-evolution-6ee6427afd6d158c62563c0f1bf6ba2067460dca.tar.bz2
gsoc2013-evolution-6ee6427afd6d158c62563c0f1bf6ba2067460dca.tar.lz
gsoc2013-evolution-6ee6427afd6d158c62563c0f1bf6ba2067460dca.tar.xz
gsoc2013-evolution-6ee6427afd6d158c62563c0f1bf6ba2067460dca.tar.zst
gsoc2013-evolution-6ee6427afd6d158c62563c0f1bf6ba2067460dca.zip
Remove e_tree_model_has_save_id().
It always returned TRUE.
Diffstat (limited to 'e-util')
-rw-r--r--e-util/e-tree-model.c21
-rw-r--r--e-util/e-tree-model.h2
-rw-r--r--e-util/e-tree-selection-model.c1
-rw-r--r--e-util/e-tree-table-adapter.c4
-rw-r--r--e-util/e-tree.c3
5 files changed, 2 insertions, 29 deletions
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 (