[evolution] Remove e_tree_model_has_get_node_by_id().



commit bd6d0c3222da89b61f04dee58ab2a2ca9fd878bc
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Jun 15 20:15:46 2013 -0400

    Remove e_tree_model_has_get_node_by_id().
    
    It always returned TRUE.

 .../evolution-util/evolution-util-sections.txt     |    1 -
 e-util/e-tree-model.c                              |   21 --------------------
 e-util/e-tree-model.h                              |    2 -
 e-util/e-tree-selection-model.c                    |    4 +--
 e-util/e-tree.c                                    |    9 +++----
 mail/message-list.c                                |    7 ------
 6 files changed, 5 insertions(+), 39 deletions(-)
---
diff --git a/doc/reference/evolution-util/evolution-util-sections.txt 
b/doc/reference/evolution-util/evolution-util-sections.txt
index b8f1f79..32443c6 100644
--- a/doc/reference/evolution-util/evolution-util-sections.txt
+++ b/doc/reference/evolution-util/evolution-util-sections.txt
@@ -4296,7 +4296,6 @@ e_tree_model_node_depth
 e_tree_model_get_expanded_default
 e_tree_model_column_count
 e_tree_model_get_save_id
-e_tree_model_has_get_node_by_id
 e_tree_model_get_node_by_id
 e_tree_model_sort_value_at
 e_tree_model_value_at
diff --git a/e-util/e-tree-model.c b/e-util/e-tree-model.c
index 881e82e..a590d8c 100644
--- a/e-util/e-tree-model.c
+++ b/e-util/e-tree-model.c
@@ -461,27 +461,6 @@ e_tree_model_get_save_id (ETreeModel *tree_model,
 }
 
 /**
- * e_tree_model_has_get_node_by_id
- * @tree_model: The ETreeModel.
- *
- * XXX docs here.
- *
- * return values: Whether this tree can quickly get a node from its save id.
- */
-gboolean
-e_tree_model_has_get_node_by_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_get_node_by_id != NULL, FALSE);
-
-       return interface->has_get_node_by_id (tree_model);
-}
-
-/**
  * e_tree_model_get_node_by_id
  * @tree_model: The ETreeModel.
  * @save_id:
diff --git a/e-util/e-tree-model.h b/e-util/e-tree-model.h
index 4771304..847632b 100644
--- a/e-util/e-tree-model.h
+++ b/e-util/e-tree-model.h
@@ -76,7 +76,6 @@ struct _ETreeModelInterface {
        gchar *         (*get_save_id)          (ETreeModel *tree_model,
                                                 ETreePath path);
 
-       gboolean        (*has_get_node_by_id)   (ETreeModel *tree_model);
        ETreePath       (*get_node_by_id)       (ETreeModel *tree_model,
                                                 const gchar *save_id);
 
@@ -165,7 +164,6 @@ gboolean    e_tree_model_get_expanded_default
 gint           e_tree_model_column_count       (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);
 ETreePath      e_tree_model_get_node_by_id     (ETreeModel *tree_model,
                                                 const gchar *save_id);
 gpointer       e_tree_model_sort_value_at      (ETreeModel *tree_model,
diff --git a/e-util/e-tree-selection-model.c b/e-util/e-tree-selection-model.c
index 208d6ae..c58bfd5 100644
--- a/e-util/e-tree-selection-model.c
+++ b/e-util/e-tree-selection-model.c
@@ -173,11 +173,9 @@ etsm_pre_change (ETreeModel *etm,
        g_free (etsm->priv->cursor_save_id);
        etsm->priv->cursor_save_id = NULL;
 
-       if (e_tree_model_has_get_node_by_id (etm) &&
-           etsm->priv->cursor_path) {
+       if (etsm->priv->cursor_path != NULL)
                etsm->priv->cursor_save_id = e_tree_model_get_save_id (
                        etm, etsm->priv->cursor_path);
-       }
 }
 
 static void
diff --git a/e-util/e-tree.c b/e-util/e-tree.c
index d5ec5ac..17cf0de 100644
--- a/e-util/e-tree.c
+++ b/e-util/e-tree.c
@@ -3175,11 +3175,10 @@ 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_get_node_by_id (et->priv->model))
-                               et->priv->expanded_list = g_list_prepend (
-                                       et->priv->expanded_list,
-                                       e_tree_model_get_save_id (
-                                       et->priv->model, path));
+                       et->priv->expanded_list = g_list_prepend (
+                               et->priv->expanded_list,
+                               e_tree_model_get_save_id (
+                               et->priv->model, path));
 
                        e_tree_table_adapter_node_set_expanded (
                                et->priv->etta, path, TRUE);
diff --git a/mail/message-list.c b/mail/message-list.c
index e95034a..e99dead 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -2697,12 +2697,6 @@ message_list_get_save_id (ETreeModel *tree_model,
        return g_strdup (camel_message_info_uid (info));
 }
 
-static gboolean
-message_list_has_get_node_by_id (ETreeModel *tree_model)
-{
-       return TRUE;
-}
-
 static ETreePath
 message_list_get_node_by_id (ETreeModel *tree_model,
                              const gchar *save_id)
@@ -3130,7 +3124,6 @@ message_list_tree_model_init (ETreeModelInterface *interface)
        interface->get_expanded_default = message_list_get_expanded_default;
        interface->column_count = message_list_column_count;
        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;
        interface->sort_value_at = message_list_sort_value_at;
        interface->value_at = message_list_value_at;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]