From patchwork Mon Feb 23 15:10:02 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cheng Renquan X-Patchwork-Id: 8413 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n1NFAKpW011202 for ; Mon, 23 Feb 2009 15:10:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755545AbZBWPK2 (ORCPT ); Mon, 23 Feb 2009 10:10:28 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755528AbZBWPK2 (ORCPT ); Mon, 23 Feb 2009 10:10:28 -0500 Received: from ti-out-0910.google.com ([209.85.142.188]:24359 "EHLO ti-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755449AbZBWPK0 (ORCPT ); Mon, 23 Feb 2009 10:10:26 -0500 Received: by ti-out-0910.google.com with SMTP id d10so1553390tib.23 for ; Mon, 23 Feb 2009 07:10:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=6I6JW3jsqHQoYWhDLjqyArGIw5JhuVBbgfmJOnEQxxQ=; b=xguH+JPbCUTAcCE+/WyWCBvUOqFGprSkk7QeD5pKxrlQAS7np+HDroRgNqxRA22YHU sQhKL2/a9cUV19T6Jb8C4pj6z4Jpm6CRKWxpbxiguPCtgqNnRc7fmBV5r+MamHLAjfpu vq8dkBaj50BaSQYabDrQzu9ky6defw0lPJcU8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=Ni7xyZzAfj21QnQIWX4kFR4bMcFa2vSiVBApVZp3BEy+ZrMJR0OEghLEFa6HSCBofX Z1K3KXKw3+DCDm3RQ+EJHwDuaCcQlq57Hdlm54vG+dZ0b5aRGAm1UZLtPjZ+wWuklYAQ VxXnz7hTL7RYWXTCZYVu0bGpKKzlV6m8sxBzE= Received: by 10.110.73.19 with SMTP id v19mr5914680tia.40.1235401825618; Mon, 23 Feb 2009 07:10:25 -0800 (PST) Received: from localhost.localdomain ([59.40.122.219]) by mx.google.com with ESMTPS id j5sm715564tid.21.2009.02.23.07.10.23 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 23 Feb 2009 07:10:24 -0800 (PST) From: Cheng Renquan To: Randy Dunlap , Sam Ravnborg , Roman Zippel 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 Message-Id: <1235401804-8136-5-git-send-email-crquan@gmail.com> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1235401804-8136-4-git-send-email-crquan@gmail.com> References: <1235401804-8136-1-git-send-email-crquan@gmail.com> <1235401804-8136-2-git-send-email-crquan@gmail.com> <1235401804-8136-3-git-send-email-crquan@gmail.com> <1235401804-8136-4-git-send-email-crquan@gmail.com> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org Futhermore, gconfig interface lack the "search a symbol" function, do later. Signed-off-by: Cheng Renquan --- 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); }