diff -Naur linux-2.6.12-rc2-mm3/Makefile linux-2.6.12-rc2-mm3-daconfig/Makefile --- linux-2.6.12-rc2-mm3/Makefile 2005-04-14 02:47:24.781675808 -0700 +++ linux-2.6.12-rc2-mm3-daconfig/Makefile 2005-04-20 01:02:36.766571232 -0700 @@ -356,7 +356,7 @@ export VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION LOCALVERSION KERNELRELEASE \ ARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \ CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE \ - HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS + HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS NAME export CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE diff -Naur linux-2.6.12-rc2-mm3/scripts/kconfig/confdata.c linux-2.6.12-rc2-mm3-daconfig/scripts/kconfig/confdata.c --- linux-2.6.12-rc2-mm3/scripts/kconfig/confdata.c 2005-04-14 02:47:25.707535056 -0700 +++ linux-2.6.12-rc2-mm3-daconfig/scripts/kconfig/confdata.c 2005-04-20 01:05:29.401326760 -0700 @@ -314,20 +314,22 @@ fprintf(out, _("#\n" "# Automatically generated make config: don't edit\n" - "# Linux kernel version: %s\n" + "# Linux kernel version: %s \"%s\"\n" "%s%s" "#\n"), sym_get_string_value(sym), + getenv("NAME"), use_timestamp ? "# " : "", use_timestamp ? ctime(&now) : ""); if (out_h) fprintf(out_h, "/*\n" " * Automatically generated C config: don't edit\n" - " * Linux kernel version: %s\n" + "# Linux kernel version: %s \"%s\"\n" "%s%s" " */\n" "#define AUTOCONF_INCLUDED\n", sym_get_string_value(sym), + getenv("NAME"), use_timestamp ? " * " : "", use_timestamp ? ctime(&now) : ""); diff -Naur linux-2.6.12-rc2-mm3/scripts/kconfig/gconf.c linux-2.6.12-rc2-mm3-daconfig/scripts/kconfig/gconf.c --- linux-2.6.12-rc2-mm3/scripts/kconfig/gconf.c 2005-04-14 02:47:25.735530800 -0700 +++ linux-2.6.12-rc2-mm3-daconfig/scripts/kconfig/gconf.c 2005-04-20 01:06:28.488344168 -0700 @@ -275,8 +275,8 @@ /*"style", PANGO_STYLE_OBLIQUE, */ NULL); - sprintf(title, _("Linux Kernel v%s Configuration"), - getenv("KERNELRELEASE")); + sprintf(title, "Linux Kernel v%s \"%s\" Configuration", + getenv("KERNELRELEASE"),getenv("NAME")); gtk_window_set_title(GTK_WINDOW(main_wnd), title); gtk_widget_show(main_wnd); diff -Naur linux-2.6.12-rc2-mm3/scripts/kconfig/mconf.c linux-2.6.12-rc2-mm3-daconfig/scripts/kconfig/mconf.c --- linux-2.6.12-rc2-mm3/scripts/kconfig/mconf.c 2005-04-14 02:47:25.757527456 -0700 +++ linux-2.6.12-rc2-mm3-daconfig/scripts/kconfig/mconf.c 2005-04-20 01:07:19.631569216 -0700 @@ -1051,9 +1051,8 @@ sym = sym_lookup("KERNELRELEASE", 0); sym_calc_value(sym); - sprintf(menu_backtitle, _("Linux Kernel v%s Configuration"), - sym_get_string_value(sym)); - + sprintf(menu_backtitle, "Linux Kernel v%s \"%s\" Configuration", + sym_get_string_value(sym), getenv("NAME")); mode = getenv("MENUCONFIG_MODE"); if (mode) { if (!strcasecmp(mode, "single_menu")) diff -Naur linux-2.6.12-rc2-mm3/scripts/kconfig/qconf.cc linux-2.6.12-rc2-mm3-daconfig/scripts/kconfig/qconf.cc --- linux-2.6.12-rc2-mm3/scripts/kconfig/qconf.cc 2005-04-14 02:47:25.770525480 -0700 +++ linux-2.6.12-rc2-mm3-daconfig/scripts/kconfig/qconf.cc 2005-04-20 01:11:45.155203488 -0700 @@ -1128,14 +1128,14 @@ if (s.isNull()) return; if (conf_read(QFile::encodeName(s))) - QMessageBox::information(this, "qconf", "Unable to load configuration!"); + QMessageBox::information(this, "Error", "Unable to load configuration!"); ConfigView::updateListAll(); } void ConfigMainWindow::saveConfig(void) { if (conf_write(NULL)) - QMessageBox::information(this, "qconf", "Unable to save configuration!"); + QMessageBox::information(this, "Error", "Unable to save configuration!"); } void ConfigMainWindow::saveConfigAs(void) @@ -1144,7 +1144,7 @@ if (s.isNull()) return; if (conf_write(QFile::encodeName(s))) - QMessageBox::information(this, "qconf", "Unable to save configuration!"); + QMessageBox::information(this, "Error", "Unable to save configuration!"); } void ConfigMainWindow::changeMenu(struct menu *menu) @@ -1280,7 +1280,7 @@ e->accept(); return; } - QMessageBox mb("qconf", "Save configuration?", QMessageBox::Warning, + QMessageBox mb("Save .config?", "Save configuration?", QMessageBox::Warning, QMessageBox::Yes | QMessageBox::Default, QMessageBox::No, QMessageBox::Cancel | QMessageBox::Escape); mb.setButtonText(QMessageBox::Yes, "&Save Changes"); mb.setButtonText(QMessageBox::No, "&Discard Changes"); @@ -1299,7 +1299,8 @@ void ConfigMainWindow::showIntro(void) { - static char str[] = "Welcome to the qconf graphical kernel configuration tool for Linux.\n\n" + static char str[1000]; + sprintf(str, "Welcome to the qconf graphical kernel configuration tool for Linux %s \"%s\".\n\n" "For each option, a blank box indicates the feature is disabled, a check\n" "indicates it is enabled, and a dot indicates that it is to be compiled\n" "as a module. Clicking on the box will cycle through the three states.\n\n" @@ -1309,9 +1310,10 @@ "options must be enabled to support the option you are interested in, you can\n" "still view the help of a grayed-out option.\n\n" "Toggling Show Debug Info under the Options menu will show the dependencies,\n" - "which you can then match by examining other options.\n\n"; + "which you can then match by examining other options.\n\n", + getenv("KERNELRELEASE"), getenv("NAME")); - QMessageBox::information(this, "qconf", str); + QMessageBox::information(this, "Introduction", str); } void ConfigMainWindow::showAbout(void) @@ -1319,7 +1321,7 @@ static char str[] = "qconf is Copyright (C) 2002 Roman Zippel .\n\n" "Bug reports and feature request can also be entered at http://bugzilla.kernel.org/\n"; - QMessageBox::information(this, "qconf", str); + QMessageBox::information(this, "About", str); } void ConfigMainWindow::saveSettings(void) @@ -1387,6 +1389,11 @@ { ConfigMainWindow* v; const char *name; + static char title[100]; + + sprintf(title,"Linux Kernel %s \"%s\" Configuration", + getenv("KERNELRELEASE"), getenv("NAME") + ); bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); @@ -1416,6 +1423,7 @@ v = new ConfigMainWindow(); + v->setCaption(title); //zconfdump(stdout); v->show(); configApp->connect(configApp, SIGNAL(lastWindowClosed()), SLOT(quit())); diff -Naur linux-2.6.12-rc2-mm3/scripts/kconfig/zconf.tab.c_shipped linux-2.6.12-rc2-mm3-daconfig/scripts/kconfig/zconf.tab.c_shipped --- linux-2.6.12-rc2-mm3/scripts/kconfig/zconf.tab.c_shipped 2005-04-14 02:45:35.700258704 -0700 +++ linux-2.6.12-rc2-mm3-daconfig/scripts/kconfig/zconf.tab.c_shipped 2005-04-20 01:02:36.860556944 -0700 @@ -1919,13 +1919,16 @@ { struct symbol *sym; int i; + static char title[100]; zconf_initscan(name); + sprintf(title,"Linux Kernel %s \"%s\" Configuration", + getenv("KERNELRELEASE"), getenv("NAME")); sym_init(); menu_init(); modules_sym = sym_lookup("MODULES", 0); - rootmenu.prompt = menu_add_prop(P_MENU, "Linux Kernel Configuration", NULL, NULL); + rootmenu.prompt = menu_add_prop(P_MENU, title, NULL, NULL); //zconfdebug = 1; zconfparse();