lkml.org 
[lkml]   [2010]   [May]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH v2 6/8] gconfig: fix null pointer warning
    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@cn.fujitsu.com>
    Acked-by: Randy Dunlap <randy.dunlap@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));
    --
    1.6.3


    \
     
     \ /
      Last update: 2010-05-07 07:59    [W:0.030 / U:30.040 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site