diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-06-20 23:49:43 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-06-21 03:31:52 +0800 |
| commit | 40da203f43caf0b2b4e49f20dbfa3b318a6b3e9f (patch) | |
| tree | c3f26d5cddf180b84250f2f81dacd05ed65cd38b | |
| parent | 63a53b5aa4e394b771d9d235e55c3098a70e5fad (diff) | |
| download | gsoc2013-evolution-40da203f43caf0b2b4e49f20dbfa3b318a6b3e9f.tar gsoc2013-evolution-40da203f43caf0b2b4e49f20dbfa3b318a6b3e9f.tar.gz gsoc2013-evolution-40da203f43caf0b2b4e49f20dbfa3b318a6b3e9f.tar.bz2 gsoc2013-evolution-40da203f43caf0b2b4e49f20dbfa3b318a6b3e9f.tar.lz gsoc2013-evolution-40da203f43caf0b2b4e49f20dbfa3b318a6b3e9f.tar.xz gsoc2013-evolution-40da203f43caf0b2b4e49f20dbfa3b318a6b3e9f.tar.zst gsoc2013-evolution-40da203f43caf0b2b4e49f20dbfa3b318a6b3e9f.zip | |
Remove e_tree_load_expanded_state().
Reducing API bloat. Do this instead:
adapter = e_tree_get_table_adapter (tree);
e_tree_table_adapter_load_expanded_state (adapter, filename);
| -rw-r--r-- | doc/reference/evolution-util/evolution-util-sections.txt | 1 | ||||
| -rw-r--r-- | e-util/e-tree.c | 9 | ||||
| -rw-r--r-- | e-util/e-tree.h | 3 | ||||
| -rw-r--r-- | mail/message-list.c | 6 |
4 files changed, 5 insertions, 14 deletions
diff --git a/doc/reference/evolution-util/evolution-util-sections.txt b/doc/reference/evolution-util/evolution-util-sections.txt index d9b5b1c309..8fe1568db3 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 e_tree_save_expanded_state_xml e_tree_load_expanded_state_xml e_tree_row_count diff --git a/e-util/e-tree.c b/e-util/e-tree.c index e0df268fc6..8c7ad56938 100644 --- a/e-util/e-tree.c +++ b/e-util/e-tree.c @@ -2196,15 +2196,6 @@ e_tree_view_to_model_row (ETree *tree, return view_row; } -void -e_tree_load_expanded_state (ETree *tree, - gchar *filename) -{ - g_return_if_fail (E_IS_TREE (tree)); - - e_tree_table_adapter_load_expanded_state (tree->priv->etta, filename); -} - xmlDoc * e_tree_save_expanded_state_xml (ETree *tree) { diff --git a/e-util/e-tree.h b/e-util/e-tree.h index 045b30769b..f9c39d1e9e 100644 --- a/e-util/e-tree.h +++ b/e-util/e-tree.h @@ -273,9 +273,6 @@ GdkDragContext *e_tree_drag_begin (ETree *tree, gboolean e_tree_is_dragging (ETree *tree); /* Adapter functions */ -void e_tree_load_expanded_state (ETree *tree, - gchar *filename); - xmlDoc * e_tree_save_expanded_state_xml (ETree *tree); void e_tree_load_expanded_state_xml (ETree *tree, xmlDoc *doc); diff --git a/mail/message-list.c b/mail/message-list.c index cddaac9110..97e0d053e5 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -1968,9 +1968,13 @@ load_tree_state (MessageList *message_list, CamelFolder *folder, xmlDoc *expand_state) { + ETreeTableAdapter *adapter; + if (folder == NULL) return; + 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); @@ -1980,7 +1984,7 @@ load_tree_state (MessageList *message_list, filename = mail_config_folder_to_cachename ( folder, "et-expanded-"); - e_tree_load_expanded_state (E_TREE (message_list), filename); + e_tree_table_adapter_load_expanded_state (adapter, filename); g_free (filename); } |