From 1b6f2e0f4c8445100f1ea6bea5b89db15dba0175 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 19 Jun 2008 08:11:43 +0000 Subject: package/config: rebase from upstream (2.6.23.14) From Bernhards tree (2737cfdd) --- package/config/gconf.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'package/config/gconf.c') diff --git a/package/config/gconf.c b/package/config/gconf.c index 4d4127095..afbddec65 100644 --- a/package/config/gconf.c +++ b/package/config/gconf.c @@ -38,9 +38,6 @@ static gboolean show_all = FALSE; static gboolean show_debug = FALSE; static gboolean resizeable = FALSE; -static char nohelp_text[] = - N_("Sorry, no help available for this option yet.\n"); - GtkWidget *main_wnd = NULL; GtkWidget *tree1_w = NULL; // left frame GtkWidget *tree2_w = NULL; // right frame @@ -462,12 +459,9 @@ static void text_insert_help(struct menu *menu) GtkTextIter start, end; const char *prompt = menu_get_prompt(menu); gchar *name; - const char *help = _(nohelp_text); + const char *help; - if (!menu->sym) - help = ""; - else if (menu->sym->help) - help = _(menu->sym->help); + help = _(menu_get_help(menu)); if (menu->sym && menu->sym->name) name = g_strdup_printf(_(menu->sym->name)); -- cgit v1.2.3