diff options
author | Arnaud Lacombe <lacombar@gmail.com> | 2010-09-19 22:47:17 -0400 |
---|---|---|
committer | Arnaud Lacombe <lacombar@gmail.com> | 2010-09-19 22:53:49 -0400 |
commit | c55c9d571a3db7a096834b6c8a58d5a32dc807e6 (patch) | |
tree | f7d4ba14e43d60cf2b8cf171cd742d614310fc2c /scripts/kconfig | |
parent | f6ce00b8cca0517f7296cd76059e1fb37d01c871 (diff) |
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>
Diffstat (limited to 'scripts/kconfig')
-rw-r--r-- | scripts/kconfig/gconf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 16362139d52a..262fbd19c1ea 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c | |||
@@ -1530,12 +1530,6 @@ int main(int ac, char *av[]) | |||
1530 | else | 1530 | else |
1531 | glade_file = g_strconcat(g_get_current_dir(), "/", av[0], ".glade", NULL); | 1531 | glade_file = g_strconcat(g_get_current_dir(), "/", av[0], ".glade", NULL); |
1532 | 1532 | ||
1533 | /* Load the interface and connect signals */ | ||
1534 | init_main_window(glade_file); | ||
1535 | init_tree_model(); | ||
1536 | init_left_tree(); | ||
1537 | init_right_tree(); | ||
1538 | |||
1539 | /* Conf stuffs */ | 1533 | /* Conf stuffs */ |
1540 | if (ac > 1 && av[1][0] == '-') { | 1534 | if (ac > 1 && av[1][0] == '-') { |
1541 | switch (av[1][1]) { | 1535 | switch (av[1][1]) { |
@@ -1555,6 +1549,12 @@ int main(int ac, char *av[]) | |||
1555 | fixup_rootmenu(&rootmenu); | 1549 | fixup_rootmenu(&rootmenu); |
1556 | conf_read(NULL); | 1550 | conf_read(NULL); |
1557 | 1551 | ||
1552 | /* Load the interface and connect signals */ | ||
1553 | init_main_window(glade_file); | ||
1554 | init_tree_model(); | ||
1555 | init_left_tree(); | ||
1556 | init_right_tree(); | ||
1557 | |||
1558 | switch (view_mode) { | 1558 | switch (view_mode) { |
1559 | case SINGLE_VIEW: | 1559 | case SINGLE_VIEW: |
1560 | display_tree_part(); | 1560 | display_tree_part(); |