aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-06-20 23:54:50 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-06-21 03:31:52 +0800
commitebcb25def12302eca4c79e995533bb7a19be4a01 (patch)
tree58d2bb1fd02c847a787b5f08d6ee204f5d736c87
parent40da203f43caf0b2b4e49f20dbfa3b318a6b3e9f (diff)
downloadgsoc2013-evolution-ebcb25def12302eca4c79e995533bb7a19be4a01.tar
gsoc2013-evolution-ebcb25def12302eca4c79e995533bb7a19be4a01.tar.gz
gsoc2013-evolution-ebcb25def12302eca4c79e995533bb7a19be4a01.tar.bz2
gsoc2013-evolution-ebcb25def12302eca4c79e995533bb7a19be4a01.tar.lz
gsoc2013-evolution-ebcb25def12302eca4c79e995533bb7a19be4a01.tar.xz
gsoc2013-evolution-ebcb25def12302eca4c79e995533bb7a19be4a01.tar.zst
gsoc2013-evolution-ebcb25def12302eca4c79e995533bb7a19be4a01.zip
Remove e_tree_save_expanded_state_xml().
Reducing API bloat. Do this instead: adapter = e_tree_get_table_adapter (tree); xml = e_tree_table_adapter_save_expanded_state_xml (adapter);
-rw-r--r--doc/reference/evolution-util/evolution-util-sections.txt1
-rw-r--r--e-util/e-tree.c8
-rw-r--r--e-util/e-tree.h1
-rw-r--r--mail/message-list.c8
4 files changed, 6 insertions, 12 deletions
diff --git a/doc/reference/evolution-util/evolution-util-sections.txt b/doc/reference/evolution-util/evolution-util-sections.txt
index 8fe1568db3..310f471fa3 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_save_expanded_state_xml
e_tree_load_expanded_state_xml
e_tree_row_count
e_tree_get_tooltip
diff --git a/e-util/e-tree.c b/e-util/e-tree.c
index 8c7ad56938..9a3d934774 100644
--- a/e-util/e-tree.c
+++ b/e-util/e-tree.c
@@ -2196,14 +2196,6 @@ e_tree_view_to_model_row (ETree *tree,
return view_row;
}
-xmlDoc *
-e_tree_save_expanded_state_xml (ETree *tree)
-{
- g_return_val_if_fail (E_IS_TREE (tree), NULL);
-
- return e_tree_table_adapter_save_expanded_state_xml (tree->priv->etta);
-}
-
void
e_tree_load_expanded_state_xml (ETree *tree,
xmlDoc *doc)
diff --git a/e-util/e-tree.h b/e-util/e-tree.h
index f9c39d1e9e..a6f1d276e6 100644
--- a/e-util/e-tree.h
+++ b/e-util/e-tree.h
@@ -273,7 +273,6 @@ GdkDragContext *e_tree_drag_begin (ETree *tree,
gboolean e_tree_is_dragging (ETree *tree);
/* Adapter functions */
-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 97e0d053e5..a27eaaf06f 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -397,6 +397,10 @@ regen_data_new (MessageList *message_list,
!message_list->just_set_folder &&
!searching) {
+ ETreeTableAdapter *adapter;
+
+ adapter = e_tree_get_table_adapter (E_TREE (message_list));
+
if (message_list->priv->any_row_changed) {
/* Something changed. If it was an expand
* state change, then save the expand state. */
@@ -405,8 +409,8 @@ regen_data_new (MessageList *message_list,
/* Remember the expand state and restore it
* after regen. */
regen_data->expand_state =
- e_tree_save_expanded_state_xml (
- E_TREE (message_list));
+ e_tree_table_adapter_save_expanded_state_xml (
+ adapter);
}
}