Prev: [PATCH] logfs: kill BKL
Next: DMAENGINE: DMA40 U8500 platform configuration v4
From: Randy Dunlap on 27 Apr 2010 16:40
On Tue, 27 Apr 2010 15:49:00 +0800 Li Zefan wrote:

> In gconfig if you enable "Show all options", you'll see some "(null)"
> config options, and clicking those options triggers a warning:
>
> (gconf:9368): Gtk-CRITICAL **: gtk_text_buffer_insert_with_tags: assertion `text != NULL' failed
>
> Signed-off-by: Li Zefan <lizf(a)cn.fujitsu.com>

Acked-by: Randy Dunlap <randy.dunlap(a)oracle.com>

> ---
> scripts/kconfig/gconf.c | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
> index 1b18329..d669882 100644
> --- a/scripts/kconfig/gconf.c
> +++ b/scripts/kconfig/gconf.c
> @@ -1343,7 +1343,8 @@ static void update_tree(struct menu *src, GtkTreeIter * dst)
> #endif
>
> if ((opt_mode == OPT_NORMAL && !menu_is_visible(child1)) ||
> - (opt_mode == OPT_PROMPT && !menu_has_prompt(child1))) {
> + (opt_mode == OPT_PROMPT && !menu_has_prompt(child1)) ||
> + (opt_mode == OPT_ALL && !menu_get_prompt(child1))) {
>
> /* remove node */
> if (gtktree_iter_find_node(dst, menu1) != NULL) {
> @@ -1425,7 +1426,7 @@ static void display_tree(struct menu *menu)
>
> if ((opt_mode == OPT_NORMAL && menu_is_visible(child)) ||
> (opt_mode == OPT_PROMPT && menu_has_prompt(child)) ||
> - (opt_mode == OPT_ALL))
> + (opt_mode == OPT_ALL && menu_get_prompt(child)))
> place_node(child, fill_row(child));
> #ifdef DEBUG
> printf("%*c%s: ", indent, ' ', menu_get_prompt(child));
> --


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH] logfs: kill BKL
Next: DMAENGINE: DMA40 U8500 platform configuration v4