From: Arnaud Lacombe <lacombar@gmail.com>
Date: Mon, 20 Sep 2010 02:47:17 +0000 (-0400)
Subject: kconfig: delay gconf window initialization
X-Git-Tag: v2.6.37-rc1~51^2~9^2~6
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=c55c9d571a3db7a096834b6c8a58d5a32dc807e6;p=~andy%2Flinux

kconfig: delay gconf window initialization

Delay the window initialization to let the rootmenu's prompt be
initialized as it will be used to get the window's title.

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
---

diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index 16362139d52..262fbd19c1e 100644
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -1530,12 +1530,6 @@ int main(int ac, char *av[])
 	else
 		glade_file = g_strconcat(g_get_current_dir(), "/", av[0], ".glade", NULL);
 
-	/* Load the interface and connect signals */
-	init_main_window(glade_file);
-	init_tree_model();
-	init_left_tree();
-	init_right_tree();
-
 	/* Conf stuffs */
 	if (ac > 1 && av[1][0] == '-') {
 		switch (av[1][1]) {
@@ -1555,6 +1549,12 @@ int main(int ac, char *av[])
 	fixup_rootmenu(&rootmenu);
 	conf_read(NULL);
 
+	/* Load the interface and connect signals */
+	init_main_window(glade_file);
+	init_tree_model();
+	init_left_tree();
+	init_right_tree();
+
 	switch (view_mode) {
 	case SINGLE_VIEW:
 		display_tree_part();