Merge branch 'kbuild/kconfig-for-40' into kbuild/kconfig

Michal Marek committed 15 years ago

Commit 51f31af2 parents de12518 bdebd483 files · +9 −20Browse files

Unified · Split

3 files

Documentation/kbuild/kconfig.txt +0 −5
scripts/kconfig/confdata.c +1 −11
scripts/kconfig/gconf.c +8 −4

@@ -48,11 +48,6 @@ KCONFIG_OVERWRITECONFIG · 47 unmodified lines
48	48	If you set KCONFIG_OVERWRITECONFIG in the environment, Kconfig will not
49	49	break symlinks when .config is a symlink to somewhere else.
50	50
51		−KCONFIG_NOTIMESTAMP
52		−--------------------------------------------------
53		−If this environment variable exists and is non-null, the timestamp line
54		−in generated .config files is omitted.
55		−
56	51	______________________________________________________________________
57	52	Environment variables for '{allyes/allmod/allno/rand}config'
58	53

scripts/kconfig/confdata.c+1−11

@@ -560,8 +560,6 @@ int conf_write(const char *name) · 559 unmodified lines
560	560	const char *basename;
561	561	const char *str;
562	562	char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1];
563		− time_t now;
564		− int use_timestamp = 1;
565	563	char *env;
566	564
567	565	dirname[0] = 0;
@@ -598,19 +596,11 @@ int conf_write(const char *name) · 30 unmodified lines
598	596	if (!out)
599	597	return 1;
600	598
601		− time(&now);
602		− env = getenv("KCONFIG_NOTIMESTAMP");
603		− if (env && *env)
604		− use_timestamp = 0;
605		−
606	599	fprintf(out, _("#\n"
607	600	"# Automatically generated make config: don't edit\n"
608	601	"# %s\n"
609		− "%s%s"
610	602	"#\n"),
611		− rootmenu.prompt->text,
612		− use_timestamp ? "# " : "",
613		− use_timestamp ? ctime(&now) : "");
	603	+ rootmenu.prompt->text);
614	604
615	605	if (!conf_get_changed())
616	606	sym_clear_all_valid();

scripts/kconfig/gconf.c+8−4

@@ -253,7 +253,7 @@ void init_left_tree(void) · 252 unmodified lines
253	253
254	254	gtk_tree_view_set_model(view, model1);
255	255	gtk_tree_view_set_headers_visible(view, TRUE);
256		− gtk_tree_view_set_rules_hint(view, FALSE);
	256	+ gtk_tree_view_set_rules_hint(view, TRUE);
257	257
258	258	column = gtk_tree_view_column_new();
259	259	gtk_tree_view_append_column(view, column);
@@ -298,7 +298,7 @@ void init_right_tree(void) · 38 unmodified lines
298	298
299	299	gtk_tree_view_set_model(view, model2);
300	300	gtk_tree_view_set_headers_visible(view, TRUE);
301		− gtk_tree_view_set_rules_hint(view, FALSE);
	301	+ gtk_tree_view_set_rules_hint(view, TRUE);
302	302
303	303	column = gtk_tree_view_column_new();
304	304	gtk_tree_view_append_column(view, column);
@@ -756,7 +756,6 @@ void on_load_clicked(GtkButton * button, gpointer user_data) · 451 unmodified lines
756	756	void on_single_clicked(GtkButton * button, gpointer user_data)
757	757	{
758	758	view_mode = SINGLE_VIEW;
759		− gtk_paned_set_position(GTK_PANED(hpaned), 0);
760	759	gtk_widget_hide(tree1_w);
761	760	current = &rootmenu;
762	761	display_tree_part();
@@ -782,7 +781,6 @@ void on_split_clicked(GtkButton * button, gpointer user_data) · 19 unmodified lines
782	781	void on_full_clicked(GtkButton * button, gpointer user_data)
783	782	{
784	783	view_mode = FULL_VIEW;
785		− gtk_paned_set_position(GTK_PANED(hpaned), 0);
786	784	gtk_widget_hide(tree1_w);
787	785	if (tree2)
788	786	gtk_tree_store_clear(tree2);
@@ -1444,6 +1442,12 @@ static void display_tree(struct menu *menu) · 655 unmodified lines
1444	1442	if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT))
1445	1443	\|\| (view_mode == FULL_VIEW)
1446	1444	\|\| (view_mode == SPLIT_VIEW))*/
	1445	+
	1446	+ /* Change paned position if the view is not in 'split mode' */
	1447	+ if (view_mode == SINGLE_VIEW \|\| view_mode == FULL_VIEW) {
	1448	+ gtk_paned_set_position(GTK_PANED(hpaned), 0);
	1449	+ }
	1450	+
1447	1451	if (((view_mode == SINGLE_VIEW) && (menu->flags & MENU_ROOT))
1448	1452	\|\| (view_mode == FULL_VIEW)
1449	1453	\|\| (view_mode == SPLIT_VIEW)) {

Merge branch 'kbuild/kconfig-for-40' into kbuild/kconfig

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code