diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-06-20 23:57:41 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-06-21 03:31:52 +0800 |
| commit | 68b0b1022158a2442fffdd67820c1576adfdb9b0 (patch) | |
| tree | eb21c7da9161518e477263adf8d367d8e4610226 | |
| parent | ebcb25def12302eca4c79e995533bb7a19be4a01 (diff) | |
| download | gsoc2013-evolution-68b0b1022158a2442fffdd67820c1576adfdb9b0.tar gsoc2013-evolution-68b0b1022158a2442fffdd67820c1576adfdb9b0.tar.gz gsoc2013-evolution-68b0b1022158a2442fffdd67820c1576adfdb9b0.tar.bz2 gsoc2013-evolution-68b0b1022158a2442fffdd67820c1576adfdb9b0.tar.lz gsoc2013-evolution-68b0b1022158a2442fffdd67820c1576adfdb9b0.tar.xz gsoc2013-evolution-68b0b1022158a2442fffdd67820c1576adfdb9b0.tar.zst gsoc2013-evolution-68b0b1022158a2442fffdd67820c1576adfdb9b0.zip | |
Remove e_tree_load_expanded_state_xml().
Reducing API bloat. Do this instead:
adapter = e_tree_get_table_adapter (tree);
e_tree_table_adapter_load_expanded_state_xml (adapter, xml);
| -rw-r--r-- | doc/reference/evolution-util/evolution-util-sections.txt | 1 | ||||
| -rw-r--r-- | e-util/e-tree.c | 10 | ||||
| -rw-r--r-- | e-util/e-tree.h | 4 | ||||
| -rw-r--r-- | mail/message-list.c | 6 |
4 files changed, 3 insertions, 18 deletions
diff --git a/doc/reference/evolution-util/evolution-util-sections.txt b/doc/reference/evolution-util/evolution-util-sections.txt index 310f471fa3..4292d40e9d 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_load_expanded_state_xml e_tree_row_count e_tree_get_tooltip e_tree_force_expanded_state diff --git a/e-util/e-tree.c b/e-util/e-tree.c index 9a3d934774..77a6c2f142 100644 --- a/e-util/e-tree.c +++ b/e-util/e-tree.c @@ -2196,16 +2196,6 @@ e_tree_view_to_model_row (ETree *tree, return view_row; } -void -e_tree_load_expanded_state_xml (ETree *tree, - xmlDoc *doc) -{ - g_return_if_fail (E_IS_TREE (tree)); - g_return_if_fail (doc != NULL); - - e_tree_table_adapter_load_expanded_state_xml (tree->priv->etta, doc); -} - /* state: <0 ... collapse; 0 ... no force - use default; >0 ... expand; * when using this, be sure to reset to 0 once no forcing is required * anymore, aka the build of the tree is done */ diff --git a/e-util/e-tree.h b/e-util/e-tree.h index a6f1d276e6..c937e62f0d 100644 --- a/e-util/e-tree.h +++ b/e-util/e-tree.h @@ -272,10 +272,6 @@ GdkDragContext *e_tree_drag_begin (ETree *tree, gboolean e_tree_is_dragging (ETree *tree); -/* Adapter functions */ -void e_tree_load_expanded_state_xml (ETree *tree, - xmlDoc *doc); - gint e_tree_row_count (ETree *tree); GtkWidget * e_tree_get_tooltip (ETree *tree); void e_tree_force_expanded_state (ETree *tree, diff --git a/mail/message-list.c b/mail/message-list.c index a27eaaf06f..c6bde53bf8 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -1979,9 +1979,9 @@ load_tree_state (MessageList *message_list, adapter = e_tree_get_table_adapter (E_TREE (message_list)); - if (expand_state) { - e_tree_load_expanded_state_xml ( - E_TREE (message_list), expand_state); + if (expand_state != NULL) { + e_tree_table_adapter_load_expanded_state_xml ( + adapter, expand_state); } else if (!message_list->search || !*message_list->search) { /* only when not searching */ gchar *filename; |