diff options
| author | Alper Yildirim <ayildirim@aselsan.com> | 2009-07-20 18:50:58 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2009-07-27 16:06:50 +0200 |
| commit | 4b3e11b3e7d00881878f45cddbfe8f4bf07d1ebe (patch) | |
| tree | 3740632b5196497242055f7ecdfe4be3c6210409 /package/config/gconf.c | |
| parent | ea536503331aea875e84ae598b4610fbd059f167 (diff) | |
| download | buildroot-novena-4b3e11b3e7d00881878f45cddbfe8f4bf07d1ebe.tar.gz buildroot-novena-4b3e11b3e7d00881878f45cddbfe8f4bf07d1ebe.zip | |
config: Update package/config to Kconfig 2.6.30
Update the package/config stuff with the code available in the Linux
kernel 2.6.30.
Signed-off-by: Alper Yildirim <ayildirim@aselsan.com>
Diffstat (limited to 'package/config/gconf.c')
| -rw-r--r-- | package/config/gconf.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/package/config/gconf.c b/package/config/gconf.c index afbddec65..b8a1661a9 100644 --- a/package/config/gconf.c +++ b/package/config/gconf.c @@ -119,8 +119,6 @@ const char *dbg_print_flags(int val) strcat(buf, "choice/"); if (val & SYMBOL_CHOICEVAL) strcat(buf, "choiceval/"); - if (val & SYMBOL_PRINTED) - strcat(buf, "printed/"); if (val & SYMBOL_VALID) strcat(buf, "valid/"); if (val & SYMBOL_OPTIONAL) @@ -457,14 +455,18 @@ static void text_insert_help(struct menu *menu) { GtkTextBuffer *buffer; GtkTextIter start, end; - const char *prompt = menu_get_prompt(menu); + const char *prompt = _(menu_get_prompt(menu)); gchar *name; const char *help; - help = _(menu_get_help(menu)); + 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)); + name = g_strdup_printf(menu->sym->name); else name = g_strdup(""); @@ -1171,7 +1173,7 @@ static gchar **fill_row(struct menu *menu) bzero(row, sizeof(row)); row[COL_OPTION] = - g_strdup_printf("%s %s", menu_get_prompt(menu), + g_strdup_printf("%s %s", _(menu_get_prompt(menu)), sym && sym_has_value(sym) ? "(NEW)" : ""); if (show_all && !menu_is_visible(menu)) @@ -1221,7 +1223,7 @@ static gchar **fill_row(struct menu *menu) if (def_menu) row[COL_VALUE] = - g_strdup(menu_get_prompt(def_menu)); + g_strdup(_(menu_get_prompt(def_menu))); } if (sym->flags & SYMBOL_CHOICEVAL) row[COL_BTNRAD] = GINT_TO_POINTER(TRUE); |