History

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

Michal Marek committed 15 years ago

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

Showing the changes to scripts (2 of 3 files). Show all

Unified · Split

2 files
  1. scripts/kconfig/confdata.c +1 −11
  2. scripts/kconfig/gconf.c +8 −4
scripts/kconfig/confdata.c+1−11
@@ -560,8 +560,6 @@ int conf_write(const char *name) · 559 unmodified lines
560560 const char *basename;
561561 const char *str;
562562 char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1];
563− time_t now;
564− int use_timestamp = 1;
565563 char *env;
566564
567565 dirname[0] = 0;
@@ -598,19 +596,11 @@ int conf_write(const char *name) · 30 unmodified lines
598596 if (!out)
599597 return 1;
600598
601− time(&now);
602− env = getenv("KCONFIG_NOTIMESTAMP");
603− if (env && *env)
604− use_timestamp = 0;
605−
606599 fprintf(out, _("#\n"
607600 "# Automatically generated make config: don't edit\n"
608601 "# %s\n"
609− "%s%s"
610602 "#\n"),
611− rootmenu.prompt->text,
612− use_timestamp ? "# " : "",
613− use_timestamp ? ctime(&now) : "");
603+ rootmenu.prompt->text);
614604
615605 if (!conf_get_changed())
616606 sym_clear_all_valid();
scripts/kconfig/gconf.c+8−4
@@ -253,7 +253,7 @@ void init_left_tree(void) · 252 unmodified lines
253253
254254 gtk_tree_view_set_model(view, model1);
255255 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);
257257
258258 column = gtk_tree_view_column_new();
259259 gtk_tree_view_append_column(view, column);
@@ -298,7 +298,7 @@ void init_right_tree(void) · 38 unmodified lines
298298
299299 gtk_tree_view_set_model(view, model2);
300300 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);
302302
303303 column = gtk_tree_view_column_new();
304304 gtk_tree_view_append_column(view, column);
@@ -756,7 +756,6 @@ void on_load_clicked(GtkButton * button, gpointer user_data) · 451 unmodified lines
756756 void on_single_clicked(GtkButton * button, gpointer user_data)
757757 {
758758 view_mode = SINGLE_VIEW;
759− gtk_paned_set_position(GTK_PANED(hpaned), 0);
760759 gtk_widget_hide(tree1_w);
761760 current = &rootmenu;
762761 display_tree_part();
@@ -782,7 +781,6 @@ void on_split_clicked(GtkButton * button, gpointer user_data) · 19 unmodified lines
782781 void on_full_clicked(GtkButton * button, gpointer user_data)
783782 {
784783 view_mode = FULL_VIEW;
785− gtk_paned_set_position(GTK_PANED(hpaned), 0);
786784 gtk_widget_hide(tree1_w);
787785 if (tree2)
788786 gtk_tree_store_clear(tree2);
@@ -1444,6 +1442,12 @@ static void display_tree(struct menu *menu) · 655 unmodified lines
14441442 if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT))
14451443 || (view_mode == FULL_VIEW)
14461444 || (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+
14471451 if (((view_mode == SINGLE_VIEW) && (menu->flags & MENU_ROOT))
14481452 || (view_mode == FULL_VIEW)
14491453 || (view_mode == SPLIT_VIEW)) {