diff options
Diffstat (limited to 'scripts/kconfig/gconf.c')
-rw-r--r-- | scripts/kconfig/gconf.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index d66988265f89..455896164d72 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c | |||
@@ -133,7 +133,6 @@ void init_main_window(const gchar * glade_file) | |||
133 | GladeXML *xml; | 133 | GladeXML *xml; |
134 | GtkWidget *widget; | 134 | GtkWidget *widget; |
135 | GtkTextBuffer *txtbuf; | 135 | GtkTextBuffer *txtbuf; |
136 | char title[256]; | ||
137 | GtkStyle *style; | 136 | GtkStyle *style; |
138 | 137 | ||
139 | xml = glade_xml_new(glade_file, "window1", NULL); | 138 | xml = glade_xml_new(glade_file, "window1", NULL); |
@@ -210,9 +209,7 @@ void init_main_window(const gchar * glade_file) | |||
210 | /*"style", PANGO_STYLE_OBLIQUE, */ | 209 | /*"style", PANGO_STYLE_OBLIQUE, */ |
211 | NULL); | 210 | NULL); |
212 | 211 | ||
213 | sprintf(title, _("Linux Kernel v%s Configuration"), | 212 | gtk_window_set_title(GTK_WINDOW(main_wnd), rootmenu.prompt->text); |
214 | getenv("KERNELVERSION")); | ||
215 | gtk_window_set_title(GTK_WINDOW(main_wnd), title); | ||
216 | 213 | ||
217 | gtk_widget_show(main_wnd); | 214 | gtk_widget_show(main_wnd); |
218 | } | 215 | } |
@@ -671,8 +668,7 @@ void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data) | |||
671 | { | 668 | { |
672 | GtkWidget *dialog; | 669 | GtkWidget *dialog; |
673 | const gchar *intro_text = _( | 670 | const gchar *intro_text = _( |
674 | "Welcome to gkc, the GTK+ graphical kernel configuration tool\n" | 671 | "Welcome to gkc, the GTK+ graphical configuration tool\n" |
675 | "for Linux.\n" | ||
676 | "For each option, a blank box indicates the feature is disabled, a\n" | 672 | "For each option, a blank box indicates the feature is disabled, a\n" |
677 | "check indicates it is enabled, and a dot indicates that it is to\n" | 673 | "check indicates it is enabled, and a dot indicates that it is to\n" |
678 | "be compiled as a module. Clicking on the box will cycle through the three states.\n" | 674 | "be compiled as a module. Clicking on the box will cycle through the three states.\n" |
@@ -1531,12 +1527,6 @@ int main(int ac, char *av[]) | |||
1531 | else | 1527 | else |
1532 | glade_file = g_strconcat(g_get_current_dir(), "/", av[0], ".glade", NULL); | 1528 | glade_file = g_strconcat(g_get_current_dir(), "/", av[0], ".glade", NULL); |
1533 | 1529 | ||
1534 | /* Load the interface and connect signals */ | ||
1535 | init_main_window(glade_file); | ||
1536 | init_tree_model(); | ||
1537 | init_left_tree(); | ||
1538 | init_right_tree(); | ||
1539 | |||
1540 | /* Conf stuffs */ | 1530 | /* Conf stuffs */ |
1541 | if (ac > 1 && av[1][0] == '-') { | 1531 | if (ac > 1 && av[1][0] == '-') { |
1542 | switch (av[1][1]) { | 1532 | switch (av[1][1]) { |
@@ -1556,6 +1546,12 @@ int main(int ac, char *av[]) | |||
1556 | fixup_rootmenu(&rootmenu); | 1546 | fixup_rootmenu(&rootmenu); |
1557 | conf_read(NULL); | 1547 | conf_read(NULL); |
1558 | 1548 | ||
1549 | /* Load the interface and connect signals */ | ||
1550 | init_main_window(glade_file); | ||
1551 | init_tree_model(); | ||
1552 | init_left_tree(); | ||
1553 | init_right_tree(); | ||
1554 | |||
1559 | switch (view_mode) { | 1555 | switch (view_mode) { |
1560 | case SINGLE_VIEW: | 1556 | case SINGLE_VIEW: |
1561 | display_tree_part(); | 1557 | display_tree_part(); |