** Fix for bug #519292

2008-03-27  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #519292

	* mail/message-list.h: (message_list_set_expand_all):
	* mail/message-list.c: (message_list_set_expand_all):
	Remove unused confusing function.
	* mail/message-list.c: (regen_list_done):
	Use numbers instead of gboolean value.

	* widgets/table/e-tree-table-adapter.c: (set_expanded_state_func),
	(set_collapsed_state_func): Use rather recurse function.


svn path=/branches/gnome-2-22/; revision=35272

5 files changed, 21 insertions, 16 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index c20c4b84da..8698c1d788 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,13 @@
+2008-03-27  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #519292
+
+	* message-list.h: (message_list_set_expand_all):
+	* message-list.c: (message_list_set_expand_all):
+	Remove unused confusing function.
+	* message-list.c: (regen_list_done):
+	Use numbers instead of gboolean value.
+
 2008-03-06  Tobias Mueller  <muelli@auftrags-killer.org>
 
 	** Fix for bug #520745
diff --git a/mail/message-list.c b/mail/message-list.c
index 3f9a3644ae..e3069e76fd 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -3547,17 +3547,6 @@ message_list_set_threaded (MessageList *ml, gboolean threaded)
 }
 
 void
-message_list_set_expand_all (MessageList *ml, gboolean threaded)
-{
-	if (ml->threaded != threaded) {
-		ml->threaded = threaded;
-
-		if (ml->frozen == 0)
-			mail_regen_list (ml, ml->search, NULL, NULL);
-	}
-}
-
-void
 message_list_set_hidedeleted (MessageList *ml, gboolean hidedeleted)
 {
 	if (ml->hidedeleted != hidedeleted) {
@@ -4063,8 +4052,8 @@ regen_list_done (struct _regen_list_msg *m)
 		else
 			load_tree_state (m->ml);
 
-		m->ml->expand_all = FALSE;
-		m->ml->collapse_all = FALSE;
+		m->ml->expand_all = 0;
+		m->ml->collapse_all = 0;
 	} else
 		build_flat (m->ml, m->summary, m->changes);
 
diff --git a/mail/message-list.h b/mail/message-list.h
index 147d76955d..806c0e2417 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -219,7 +219,6 @@ void	       message_list_set_threaded (MessageList *ml, gboolean threaded);
 void           message_list_set_threaded_expand_all (MessageList *ml);
 void           message_list_set_threaded_collapse_all (MessageList *ml);
 
-void           message_list_set_expand_all (MessageList *ml, gboolean threaded);
 void	       message_list_set_hidedeleted (MessageList *ml, gboolean hidedeleted);
 void	       message_list_set_search (MessageList *ml, const char *search);
 
diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog
index 0c5a19abb6..419e2f0ab1 100644
--- a/widgets/table/ChangeLog
+++ b/widgets/table/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-27  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #519292
+
+	* e-tree-table-adapter.c: (set_expanded_state_func),
+	(set_collapsed_state_func): Use rather recurse function.
+
 2008-02-19  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #209353
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c
index 5712069581..9898204dae 100644
--- a/widgets/table/e-tree-table-adapter.c
+++ b/widgets/table/e-tree-table-adapter.c
@@ -991,7 +991,7 @@ set_expanded_state_func (gpointer keyp, gpointer value, gpointer data)
 	ETreeTableAdapter *etta = (ETreeTableAdapter *) data;
 
 	if (node->expanded != TRUE) {
-		e_tree_table_adapter_node_set_expanded(etta, path, TRUE);
+		e_tree_table_adapter_node_set_expanded_recurse (etta, path, TRUE);
 		node->expanded = TRUE;
 	}
 }
@@ -1004,7 +1004,7 @@ set_collapsed_state_func (gpointer keyp, gpointer value, gpointer data)
 	ETreeTableAdapter *etta = (ETreeTableAdapter *) data;
 
 	if (node->expanded != FALSE) {
-		e_tree_table_adapter_node_set_expanded(etta, path, FALSE);
+		e_tree_table_adapter_node_set_expanded_recurse (etta, path, FALSE);
 		node->expanded = FALSE;
 	}
 }