From: Cheng Renquan <crquan@gmail.com>
To: Randy Dunlap <randy.dunlap@oracle.com>,
Sam Ravnborg <sam@ravnborg.org>,
Roman Zippel <zippel@linux-m68k.org>
Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
cr_quan@163.com
Subject: [PATCH 4/6] [KBUILD] make use of menu_get_ext_help in gconfig
Date: Mon, 23 Feb 2009 23:10:02 +0800 [thread overview]
Message-ID: <1235401804-8136-5-git-send-email-crquan@gmail.com> (raw)
In-Reply-To: <1235401804-8136-4-git-send-email-crquan@gmail.com>
Futhermore, gconfig interface lack the "search a symbol" function, do later.
Signed-off-by: Cheng Renquan <crquan@gmail.com>
---
scripts/kconfig/gconf.c | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index 199b22b..6546436 100644
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -456,19 +456,9 @@ static void text_insert_help(struct menu *menu)
GtkTextBuffer *buffer;
GtkTextIter start, end;
const char *prompt = _(menu_get_prompt(menu));
- gchar *name;
- const char *help;
+ struct gstr help = str_new();
- help = menu_get_help(menu);
-
- /* 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("");
+ menu_get_ext_help(menu, &help);
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_w));
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_insert_with_tags(buffer, &end, prompt, -1, tag1,
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_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);
+ str_free(&help);
}
--
1.6.0.6
next prev parent reply other threads:[~2009-02-23 15:11 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-23 15:09 [PATCH 0/6] [KBUILD] configuration system improvements Cheng Renquan
2009-02-23 15:09 ` [PATCH 1/6] [KBUILD] add symbol value to help find the real depend Cheng Renquan
2009-02-23 15:10 ` [PATCH 2/6] [KBUILD] add menu_get_ext_help function to display more information Cheng Renquan
2009-02-23 15:10 ` [PATCH 3/6] [KBUILD] menuconfig improvements Cheng Renquan
2009-02-23 15:10 ` Cheng Renquan [this message]
2009-02-23 15:10 ` [PATCH 5/6] [KBUILD] make use of menu_get_ext_help in qconfig Cheng Renquan
2009-02-23 15:10 ` [PATCH 6/6] [KBUILD] make use of menu_get_ext_help in "make config" Cheng Renquan
2009-03-02 3:42 ` [PATCH 0/6] [KBUILD] configuration system improvements Randy Dunlap
2009-03-03 4:09 ` Cheng Renquan
2009-03-03 18:24 ` Randy Dunlap
2009-03-03 19:55 ` Randy Dunlap
2009-03-04 6:50 ` Cheng Renquan
2009-03-04 17:18 ` Randy Dunlap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1235401804-8136-5-git-send-email-crquan@gmail.com \
--to=crquan@gmail.com \
--cc=cr_quan@163.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=randy.dunlap@oracle.com \
--cc=sam@ravnborg.org \
--cc=zippel@linux-m68k.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.