Commit b3b8b64c authored by Linus Torvalds's avatar Linus Torvalds

Merge home.osdl.org:/home/torvalds/v2.5/kconfig

into home.osdl.org:/home/torvalds/v2.5/linux
parents 67215df9 45db9063
...@@ -575,6 +575,9 @@ int main(int ac, char **av) ...@@ -575,6 +575,9 @@ int main(int ac, char **av)
conf_cnt = 0; conf_cnt = 0;
check_conf(&rootmenu); check_conf(&rootmenu);
} while (conf_cnt); } while (conf_cnt);
conf_write(NULL); if (conf_write(NULL)) {
fprintf(stderr, "\n*** Error during writing of the kernel configuration.\n\n");
return 1;
}
return 0; return 0;
} }
/* Hey EMACS -*- linux-c -*- */ /* Hey EMACS -*- linux-c -*- */
/* /*
* *
* Copyright (C) 2002-2003 Romain Lievin <roms@lpg.ticalc.org> * Copyright (C) 2002-2003 Romain Lievin <roms@tilp.info>
* Released under the terms of the GNU GPL v2.0. * Released under the terms of the GNU GPL v2.0.
* *
*/ */
...@@ -1046,7 +1046,8 @@ on_treeview2_button_press_event(GtkWidget * widget, ...@@ -1046,7 +1046,8 @@ on_treeview2_button_press_event(GtkWidget * widget,
if (path == NULL) if (path == NULL)
return FALSE; return FALSE;
gtk_tree_model_get_iter(model2, &iter, path); if (!gtk_tree_model_get_iter(model2, &iter, path))
return FALSE;
gtk_tree_model_get(model2, &iter, COL_MENU, &menu, -1); gtk_tree_model_get(model2, &iter, COL_MENU, &menu, -1);
col = column2index(column); col = column2index(column);
...@@ -1172,7 +1173,7 @@ on_treeview1_button_press_event(GtkWidget * widget, ...@@ -1172,7 +1173,7 @@ on_treeview1_button_press_event(GtkWidget * widget,
gtk_widget_realize(tree2_w); gtk_widget_realize(tree2_w);
gtk_tree_view_set_cursor(view, path, NULL, FALSE); gtk_tree_view_set_cursor(view, path, NULL, FALSE);
gtk_widget_grab_focus(GTK_WIDGET(tree2_w)); gtk_widget_grab_focus(tree2_w);
return FALSE; return FALSE;
} }
...@@ -1401,7 +1402,6 @@ static void update_tree(struct menu *src, GtkTreeIter * dst) ...@@ -1401,7 +1402,6 @@ static void update_tree(struct menu *src, GtkTreeIter * dst)
struct symbol *sym; struct symbol *sym;
struct property *prop; struct property *prop;
struct menu *menu1, *menu2; struct menu *menu1, *menu2;
static GtkTreePath *path = NULL;
if (src == &rootmenu) if (src == &rootmenu)
indent = 1; indent = 1;
...@@ -1526,7 +1526,7 @@ static void display_tree(struct menu *menu) ...@@ -1526,7 +1526,7 @@ static void display_tree(struct menu *menu)
if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT)) || if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT)) ||
(view_mode == FULL_VIEW) (view_mode == FULL_VIEW)
|| (view_mode == SPLIT_VIEW))*/ || (view_mode == SPLIT_VIEW))*/
if ((view_mode == SINGLE_VIEW) && (menu->flags & MENU_ROOT) if (((view_mode == SINGLE_VIEW) && (menu->flags & MENU_ROOT))
|| (view_mode == FULL_VIEW) || (view_mode == SPLIT_VIEW)) { || (view_mode == FULL_VIEW) || (view_mode == SPLIT_VIEW)) {
indent++; indent++;
display_tree(child); display_tree(child);
...@@ -1582,7 +1582,7 @@ void fixup_rootmenu(struct menu *menu) ...@@ -1582,7 +1582,7 @@ void fixup_rootmenu(struct menu *menu)
int main(int ac, char *av[]) int main(int ac, char *av[])
{ {
const char *name; const char *name;
gchar *cur_dir, *exe_path; char *env;
gchar *glade_file; gchar *glade_file;
#ifndef LKC_DIRECT_LINK #ifndef LKC_DIRECT_LINK
...@@ -1598,12 +1598,13 @@ int main(int ac, char *av[]) ...@@ -1598,12 +1598,13 @@ int main(int ac, char *av[])
//add_pixmap_directory (PACKAGE_SOURCE_DIR "/pixmaps"); //add_pixmap_directory (PACKAGE_SOURCE_DIR "/pixmaps");
/* Determine GUI path */ /* Determine GUI path */
cur_dir = g_get_current_dir(); env = getenv(SRCTREE);
exe_path = g_strdup(av[0]); if (env)
exe_path[0] = '/'; glade_file = g_strconcat(env, "/scripts/kconfig/gconf.glade", NULL);
glade_file = g_strconcat(cur_dir, exe_path, ".glade", NULL); else if (av[0][0] == '/')
g_free(cur_dir); glade_file = g_strconcat(av[0], ".glade", NULL);
g_free(exe_path); else
glade_file = g_strconcat(g_get_current_dir(), "/", av[0], ".glade", NULL);
/* Load the interface and connect signals */ /* Load the interface and connect signals */
init_main_window(glade_file); init_main_window(glade_file);
......
...@@ -785,15 +785,23 @@ int main(int ac, char **av) ...@@ -785,15 +785,23 @@ int main(int ac, char **av)
} while (stat < 0); } while (stat < 0);
if (stat == 0) { if (stat == 0) {
conf_write(NULL); if (conf_write(NULL)) {
fprintf(stderr, "\n\n"
"Error during writing of the kernel configuration.\n"
"Your kernel configuration changes were NOT saved."
"\n\n");
return 1;
}
printf("\n\n" printf("\n\n"
"*** End of Linux kernel configuration.\n" "*** End of Linux kernel configuration.\n"
"*** Execute 'make' to build the kernel or try 'make help'." "*** Execute 'make' to build the kernel or try 'make help'."
"\n\n"); "\n\n");
} else } else {
printf("\n\n" fprintf(stderr, "\n\n"
"Your kernel configuration changes were NOT saved." "Your kernel configuration changes were NOT saved."
"\n\n"); "\n\n");
return 1;
}
return 0; return 0;
} }
...@@ -409,7 +409,7 @@ void ConfigList::updateList(ConfigItem* item) ...@@ -409,7 +409,7 @@ void ConfigList::updateList(ConfigItem* item)
item = new ConfigItem(this, 0, true); item = new ConfigItem(this, 0, true);
last = item; last = item;
} }
if ((mode == singleMode || mode == symbolMode) && if ((mode == singleMode || (mode == symbolMode && !(rootEntry->flags & MENU_ROOT))) &&
rootEntry->sym && rootEntry->prompt) { rootEntry->sym && rootEntry->prompt) {
item = last ? last->nextSibling() : firstChild(); item = last ? last->nextSibling() : firstChild();
if (!item) if (!item)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment