diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-06-20 11:05:40 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-06-21 03:31:50 +0800 |
| commit | de9391e246bcbf1ff5734e47eccec07bdc4113b8 (patch) | |
| tree | cf59f9fc93a2a82a8943e15d9dff4a99a50fd483 | |
| parent | 31c6240eeba58231acd5c14e1a8b6e50d0bdcfb9 (diff) | |
| download | gsoc2013-evolution-de9391e246bcbf1ff5734e47eccec07bdc4113b8.tar gsoc2013-evolution-de9391e246bcbf1ff5734e47eccec07bdc4113b8.tar.gz gsoc2013-evolution-de9391e246bcbf1ff5734e47eccec07bdc4113b8.tar.bz2 gsoc2013-evolution-de9391e246bcbf1ff5734e47eccec07bdc4113b8.tar.lz gsoc2013-evolution-de9391e246bcbf1ff5734e47eccec07bdc4113b8.tar.xz gsoc2013-evolution-de9391e246bcbf1ff5734e47eccec07bdc4113b8.tar.zst gsoc2013-evolution-de9391e246bcbf1ff5734e47eccec07bdc4113b8.zip | |
Remove e_tree_selected_path_foreach().
Reducing API bloat. Do this instead:
selection = (ETreeSelectionModel *) e_tree_get_selection_model (tree);
e_tree_selection_model_foreach (selection, callback, closure);
| -rw-r--r-- | doc/reference/evolution-util/evolution-util-sections.txt | 1 | ||||
| -rw-r--r-- | e-util/e-tree.c | 12 | ||||
| -rw-r--r-- | e-util/e-tree.h | 3 | ||||
| -rw-r--r-- | mail/message-list.c | 9 |
4 files changed, 6 insertions, 19 deletions
diff --git a/doc/reference/evolution-util/evolution-util-sections.txt b/doc/reference/evolution-util/evolution-util-sections.txt index 5a718f340e..a4ddf6afaa 100644 --- a/doc/reference/evolution-util/evolution-util-sections.txt +++ b/doc/reference/evolution-util/evolution-util-sections.txt @@ -4192,7 +4192,6 @@ e_tree_load_state e_tree_show_cursor_after_reflow e_tree_set_cursor e_tree_get_cursor -e_tree_selected_path_foreach e_tree_path_foreach e_tree_get_printable e_tree_get_next_row diff --git a/e-util/e-tree.c b/e-util/e-tree.c index be43ffad18..bf6c1ab59b 100644 --- a/e-util/e-tree.c +++ b/e-util/e-tree.c @@ -1909,18 +1909,6 @@ e_tree_get_cursor (ETree *tree) E_TREE_SELECTION_MODEL (tree->priv->selection)); } -void -e_tree_selected_path_foreach (ETree *tree, - ETreeForeachFunc callback, - gpointer closure) -{ - g_return_if_fail (E_IS_TREE (tree)); - - e_tree_selection_model_foreach ( - E_TREE_SELECTION_MODEL (tree->priv->selection), - callback, closure); -} - /* Standard functions */ static void et_foreach_recurse (ETreeModel *model, diff --git a/e-util/e-tree.h b/e-util/e-tree.h index 50fbbb6e54..5257996a8c 100644 --- a/e-util/e-tree.h +++ b/e-util/e-tree.h @@ -217,9 +217,6 @@ void e_tree_set_cursor (ETree *tree, /* NULL means we don't have the cursor. */ ETreePath e_tree_get_cursor (ETree *tree); -void e_tree_selected_path_foreach (ETree *tree, - ETreeForeachFunc callback, - gpointer closure); void e_tree_path_foreach (ETree *tree, ETreeForeachFunc callback, gpointer closure); diff --git a/mail/message-list.c b/mail/message-list.c index d15a202485..e6f16574c7 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -1104,7 +1104,7 @@ select_thread (MessageList *message_list, tree = E_TREE (message_list); etsm = (ETreeSelectionModel *) e_tree_get_selection_model (tree); - e_tree_selected_path_foreach (tree, selector, &tsi); + e_tree_selection_model_foreach (etsm, selector, &tsi); e_tree_selection_model_select_paths (etsm, tsi.paths); @@ -4672,6 +4672,7 @@ GPtrArray * message_list_get_selected (MessageList *message_list) { CamelFolder *folder; + ESelectionModel *selection; struct _ml_selected_data data = { message_list, @@ -4680,8 +4681,10 @@ message_list_get_selected (MessageList *message_list) g_ptr_array_set_free_func (data.uids, (GDestroyNotify) g_free); - e_tree_selected_path_foreach ( - E_TREE (message_list), + selection = e_tree_get_selection_model (E_TREE (message_list)); + + e_tree_selection_model_foreach ( + E_TREE_SELECTION_MODEL (selection), (ETreeForeachFunc) ml_getselected_cb, &data); folder = message_list_ref_folder (message_list); |