lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kconfig: make use of menu_get_ext_help in gconfig

Browse Source 
Futhermore, gconfig interface lack the "search a symbol" function, do later.

Signed-off-by: Cheng Renquan <crquan@gmail.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
[sam: fix SEGV in gconfig]
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
This commit is contained in:
Cheng Renquan
2009-07-12 16:11:46 +08:00
committed by Sam Ravnborg
parent 66c4bd8085
commit 4779105e03
2 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/kconfig/gconf.c
View File

@@ -456,19 +456,9 @@ static void text_insert_help(struct menu *menu)
GtkTextBuffer *buffer; GtkTextBuffer *buffer;
GtkTextIter start, end; GtkTextIter start, end;
const char *prompt = _(menu_get_prompt(menu)); const char *prompt = _(menu_get_prompt(menu));
gchar *name; struct gstr help = str_new();
const char *help;
help = menu_get_help(menu); menu_get_ext_help(menu, &help);
/* Gettextize if the help text not empty */
if ((help != 0) && (help[0] != 0))
help = _(help);
if (menu->sym && menu->sym->name)
name = g_strdup_printf(menu->sym->name);
else
name = g_strdup("");
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_w)); buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_w));
gtk_text_buffer_get_bounds(buffer, &start, &end); gtk_text_buffer_get_bounds(buffer, &start, &end);
@@ -478,14 +468,11 @@ static void text_insert_help(struct menu *menu)
gtk_text_buffer_get_end_iter(buffer, &end); gtk_text_buffer_get_end_iter(buffer, &end);
gtk_text_buffer_insert_with_tags(buffer, &end, prompt, -1, tag1, gtk_text_buffer_insert_with_tags(buffer, &end, prompt, -1, tag1,
NULL); NULL);
gtk_text_buffer_insert_at_cursor(buffer, " ", 1);
gtk_text_buffer_get_end_iter(buffer, &end);
gtk_text_buffer_insert_with_tags(buffer, &end, name, -1, tag1,
NULL);
gtk_text_buffer_insert_at_cursor(buffer, "\n\n", 2); gtk_text_buffer_insert_at_cursor(buffer, "\n\n", 2);
gtk_text_buffer_get_end_iter(buffer, &end); gtk_text_buffer_get_end_iter(buffer, &end);
gtk_text_buffer_insert_with_tags(buffer, &end, help, -1, tag2, gtk_text_buffer_insert_with_tags(buffer, &end, str_get(&help), -1, tag2,
NULL); NULL);
str_free(&help);
} }

1
scripts/kconfig/menu.c
View File

@@ -528,5 +528,6 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help)
} else { } else {
str_append(help, nohelp_text); str_append(help, nohelp_text);
} }
if (sym)
get_symbol_str(help, sym); get_symbol_str(help, sym);
} }