[PATCH] gconfig bug fixes

[Romain Lievin]

Hi,

a patch which fix a bug reported by Nuno Tavares and another one.

Please apply, Romain.
==========================[ cut here ]=========================
diff -Naur linux-2.5.70/scripts/kconfig/gconf.c linux/scripts/kconfig/gconf.c
--- linux-2.5.70/scripts/kconfig/gconf.c	Mon May  5 01:53:41 2003
+++ linux/scripts/kconfig/gconf.c	Sun Jun  1 11:34:31 2003
@@ -836,6 +836,8 @@
 	gtk_widget_show(tree1_w);
 	gtk_window_get_default_size(GTK_WINDOW(main_wnd), &w, &h);
 	gtk_paned_set_position(GTK_PANED(hpaned), w / 2);
+	if (tree2)	
+		gtk_tree_store_clear(tree2);
 	display_list();
 }
 
@@ -922,8 +924,10 @@
 		config_changed = TRUE;
 		if (view_mode == FULL_VIEW)
 			update_tree(&rootmenu, NULL);
-		else if (view_mode == SPLIT_VIEW)
+		else if (view_mode == SPLIT_VIEW) {
 			update_tree(current, NULL);
+			display_list();
+		}
 		else if (view_mode == SINGLE_VIEW)
 			display_tree_part();	//fixme: keep exp/coll
 		break;
@@ -949,8 +953,10 @@
 	sym_set_tristate_value(menu->sym, newval);
 	if (view_mode == FULL_VIEW)
 		update_tree(&rootmenu, NULL);
-	else if (view_mode == SPLIT_VIEW)
+	else if (view_mode == SPLIT_VIEW) {
 		update_tree(current, NULL);
+		display_list();
+	}
 	else if (view_mode == SINGLE_VIEW)
 		display_tree_part();	//fixme: keep exp/coll
 }
@@ -1036,7 +1042,7 @@
 		ptype = menu->prompt ? menu->prompt->type : P_UNKNOWN;
 
 		if (((ptype == P_MENU) || (ptype == P_ROOTMENU)) &&
-		    (view_mode == SINGLE_VIEW) && (col == COL_OPTION)) {
+		    (view_mode != FULL_VIEW) && (col == COL_OPTION)) {
 			// goes down into menu
 			current = menu;
 			display_tree_part();
@@ -1525,8 +1531,6 @@
 /* Display the list in the left frame (split view) */
 static void display_list(void)
 {
-	if (tree2)
-		gtk_tree_store_clear(tree2);
 	if (tree1)
 		gtk_tree_store_clear(tree1);
 
========================[ here ]=============================
-- 
Romain Lievin, aka 'roms'  	<[e-mail]>
The TiLP project is on 		<http://www.ti-lpg.org>
"Linux, y'a moins bien mais c'est plus cher !"