aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-06-20 23:06:44 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-06-21 03:31:51 +0800
commit792f0ba3748bda87b08e1c4e564a618b3b427c4f (patch)
treea13a41f33e5ba4fed9700658c9c20322516cd5a9
parent43ffc445dd3ce93f3129b517ebe6ea6f3da25f18 (diff)
downloadgsoc2013-evolution-792f0ba3748bda87b08e1c4e564a618b3b427c4f.tar
gsoc2013-evolution-792f0ba3748bda87b08e1c4e564a618b3b427c4f.tar.gz
gsoc2013-evolution-792f0ba3748bda87b08e1c4e564a618b3b427c4f.tar.bz2
gsoc2013-evolution-792f0ba3748bda87b08e1c4e564a618b3b427c4f.tar.lz
gsoc2013-evolution-792f0ba3748bda87b08e1c4e564a618b3b427c4f.tar.xz
gsoc2013-evolution-792f0ba3748bda87b08e1c4e564a618b3b427c4f.tar.zst
gsoc2013-evolution-792f0ba3748bda87b08e1c4e564a618b3b427c4f.zip
Remove e_tree_row_of_node().
Reducing API bloat. Do this instead: adapter = e_tree_get_table_adapter (tree); row = e_tree_table_adapter_row_of_node (adapter, path);
-rw-r--r--doc/reference/evolution-util/evolution-util-sections.txt1
-rw-r--r--e-util/e-tree.c17
-rw-r--r--e-util/e-tree.h2
-rw-r--r--mail/message-list.c2
4 files changed, 7 insertions, 15 deletions
diff --git a/doc/reference/evolution-util/evolution-util-sections.txt b/doc/reference/evolution-util/evolution-util-sections.txt
index 50be301721..0e8f9945c5 100644
--- a/doc/reference/evolution-util/evolution-util-sections.txt
+++ b/doc/reference/evolution-util/evolution-util-sections.txt
@@ -4207,7 +4207,6 @@ e_tree_drag_source_set
e_tree_drag_source_unset
e_tree_drag_begin
e_tree_is_dragging
-e_tree_row_of_node
e_tree_root_node_is_visible
e_tree_show_node
e_tree_save_expanded_state
diff --git a/e-util/e-tree.c b/e-util/e-tree.c
index 67776e977a..3ad966c70b 100644
--- a/e-util/e-tree.c
+++ b/e-util/e-tree.c
@@ -769,10 +769,14 @@ scroll_to_cursor (ETree *tree)
path = e_tree_get_cursor (tree);
x = y = w = h = 0;
- if (path) {
- gint row = e_tree_row_of_node (tree, path);
+ if (path != NULL) {
+ ETreeTableAdapter *adapter;
+ gint row;
gint col = 0;
+ adapter = e_tree_get_table_adapter (tree);
+ row = e_tree_table_adapter_row_of_node (adapter, path);
+
if (row >= 0)
e_table_item_get_cell_geometry (
E_TABLE_ITEM (tree->priv->item),
@@ -2192,15 +2196,6 @@ e_tree_view_to_model_row (ETree *tree,
return view_row;
}
-gint
-e_tree_row_of_node (ETree *tree,
- ETreePath path)
-{
- g_return_val_if_fail (E_IS_TREE (tree), -1);
-
- return e_tree_table_adapter_row_of_node (tree->priv->etta, path);
-}
-
gboolean
e_tree_root_node_is_visible (ETree *tree)
{
diff --git a/e-util/e-tree.h b/e-util/e-tree.h
index 29cee6ef4f..9a4efe9709 100644
--- a/e-util/e-tree.h
+++ b/e-util/e-tree.h
@@ -273,8 +273,6 @@ GdkDragContext *e_tree_drag_begin (ETree *tree,
gboolean e_tree_is_dragging (ETree *tree);
/* Adapter functions */
-gint e_tree_row_of_node (ETree *tree,
- ETreePath path);
gboolean e_tree_root_node_is_visible (ETree *tree);
void e_tree_show_node (ETree *tree,
ETreePath path);
diff --git a/mail/message-list.c b/mail/message-list.c
index cda78f9e31..bb3c30b50e 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -3550,7 +3550,7 @@ find_next_selectable (MessageList *message_list)
last = e_tree_row_count (et);
/* model_to_view_row etc simply dont work for sorted views. Sigh. */
- vrow_orig = e_tree_row_of_node (et, node);
+ vrow_orig = e_tree_table_adapter_row_of_node (adapter, node);
/* We already checked this node. */
vrow = vrow_orig + 1;