pass FALSE for expand to e_summary_shown_add_node. ditto,

2003-03-13  Mike Kestner  <mkestner@ximian.com>

	* e-summary-preferences.c (fill_rdf_etable): pass FALSE for
	expand to e_summary_shown_add_node.
	* e-summary-shown.c (make_table): ditto, set_expanded_default to FALSE.
	(add_node): only call e_tree_node_set_expanded is expanded != default.
	* e-summary-weather.c (*_fill_etable): pass FALSE for expand to
	e_summary_shown_add_node.

svn path=/trunk/; revision=20284

4 files changed, 20 insertions, 10 deletions

diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index 12cac98092..d40f6b9f7c 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,3 +1,12 @@
+2003-03-13  Mike Kestner  <mkestner@ximian.com>
+
+	* e-summary-preferences.c (fill_rdf_etable): pass FALSE for 
+	expand to e_summary_shown_add_node.
+	* e-summary-shown.c (make_table): ditto, set_expanded_default to FALSE.
+	(add_node): only call e_tree_node_set_expanded is expanded != default.
+	* e-summary-weather.c (*_fill_etable): pass FALSE for expand to 
+	e_summary_shown_add_node.
+
 2003-03-13  Ettore Perazzoli  <ettore@ximian.com>
 
 	* e-summary-calendar.c (generate_html): Changed so its printf()s
diff --git a/my-evolution/e-summary-preferences.c b/my-evolution/e-summary-preferences.c
index 3e117df284..bc37c3326f 100644
--- a/my-evolution/e-summary-preferences.c
+++ b/my-evolution/e-summary-preferences.c
@@ -453,7 +453,7 @@ fill_rdf_etable (GtkWidget *widget,
 		entry->showable = TRUE;
 		entry->data = &rdfs[i];
 		
-		e_summary_shown_add_node (ess, TRUE, entry, NULL, TRUE, NULL);
+		e_summary_shown_add_node (ess, TRUE, entry, NULL, FALSE, NULL);
 
 		if (rdf_is_shown (pd, rdfs[i].url) == TRUE) {
 			entry = g_new (ESummaryShownModelEntry, 1);
@@ -462,7 +462,7 @@ fill_rdf_etable (GtkWidget *widget,
 			entry->showable = TRUE;
 			entry->data = &rdfs[i];
 			
-			e_summary_shown_add_node (ess, FALSE, entry, NULL, TRUE, NULL);
+			e_summary_shown_add_node (ess, FALSE, entry, NULL, FALSE, NULL);
 		}
 
 		pd->rdf->known = g_slist_append (pd->rdf->known, &rdfs[i]);
@@ -520,7 +520,7 @@ fill_rdf_etable (GtkWidget *widget,
 		entry->showable = TRUE;
 		entry->data = info;
 		
-		e_summary_shown_add_node (ess, TRUE, entry, NULL, TRUE, NULL);
+		e_summary_shown_add_node (ess, TRUE, entry, NULL, FALSE, NULL);
 
 		if (rdf_is_shown (pd, tokens[0]) == TRUE) {
 			entry = g_new (ESummaryShownModelEntry, 1);
@@ -529,7 +529,7 @@ fill_rdf_etable (GtkWidget *widget,
 			entry->showable = TRUE;
 			entry->data = info;
 			
-			e_summary_shown_add_node (ess, FALSE, entry, NULL, TRUE, NULL);
+			e_summary_shown_add_node (ess, FALSE, entry, NULL, FALSE, NULL);
 		}
 
 		g_strfreev (tokens);
@@ -586,7 +586,7 @@ add_dialog_clicked_cb (GtkWidget *widget,
 			entry->data = info;
 			
 			e_summary_shown_add_node (E_SUMMARY_SHOWN (pd->rdf->etable), TRUE,
-						  entry, NULL, TRUE, NULL);
+						  entry, NULL, FALSE, NULL);
 
 			/* Should we add to shown? */
 
diff --git a/my-evolution/e-summary-shown.c b/my-evolution/e-summary-shown.c
index 98301059c1..8aa31f415b 100644
--- a/my-evolution/e-summary-shown.c
+++ b/my-evolution/e-summary-shown.c
@@ -374,7 +374,7 @@ add_clicked (GtkWidget *button,
 
 	for (iterator = list; iterator; iterator = iterator->next) {
 		ESummaryShownModelEntry *new_entry = iterator->data;
-		e_summary_shown_add_node (shown, FALSE, new_entry, NULL, TRUE, NULL);
+		e_summary_shown_add_node (shown, FALSE, new_entry, NULL, FALSE, NULL);
 	}
 
 	g_list_free (list);
@@ -462,7 +462,7 @@ make_table (GHashTable *data_model,
 					       
 					       data_model);
 	etmm = E_TREE_MEMORY (td->etm);
-	e_tree_memory_set_expanded_default (etmm, TRUE);
+	e_tree_memory_set_expanded_default (etmm, FALSE);
 
 	td->root = e_tree_memory_node_insert (etmm, NULL, 0, NULL);
 
@@ -590,7 +590,8 @@ e_summary_shown_add_node (ESummaryShown *shown,
 	path = e_tree_memory_node_insert (etmm, parent, -1, data);
 
 	tree = e_tree_scrolled_get_tree (E_TREE_SCROLLED (td->etable));
-	e_tree_node_set_expanded (tree, path, expanded);
+	if (e_tree_model_get_expanded_default (E_TREE_MODEL(etmm)) != expanded)
+		e_tree_node_set_expanded (tree, path, expanded);
 
 	entry->path = path;
 	
diff --git a/my-evolution/e-summary-weather.c b/my-evolution/e-summary-weather.c
index 77614198f7..a6a2497370 100644
--- a/my-evolution/e-summary-weather.c
+++ b/my-evolution/e-summary-weather.c
@@ -729,12 +729,12 @@ e_summary_weather_fill_etable (ESummaryShown *ess)
 					entry->name = g_strdup (locdata[0]);
 					entry->showable = TRUE;
 
-					location = e_summary_shown_add_node (ess, TRUE, entry, state, TRUE, NULL);
+					location = e_summary_shown_add_node (ess, TRUE, entry, state, FALSE, NULL);
 					if (is_weather_shown (locdata[1]) == TRUE) {
 						entry = g_new (ESummaryShownModelEntry, 1);
 						entry->location = g_strdup (locdata[1]);
 						entry->name = g_strdup (locdata[0]);
-						location = e_summary_shown_add_node (ess, FALSE, entry, NULL, TRUE, NULL);
+						location = e_summary_shown_add_node (ess, FALSE, entry, NULL, FALSE, NULL);
 					}
 					g_strfreev (locdata);
 				}