diff options
Diffstat (limited to 'riscos/menus.c')
-rw-r--r-- | riscos/menus.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/riscos/menus.c b/riscos/menus.c index e51fc34c5..29d514122 100644 --- a/riscos/menus.c +++ b/riscos/menus.c @@ -875,8 +875,7 @@ bool ro_gui_menu_translate(struct menu_definition *menu) int alphabet; struct menu_definition_entry *entry; char *translated; - utf8_convert_ret err; - + nserror err; /* read current alphabet */ error = xosbyte1(osbyte_ALPHABET_NUMBER, 127, 0, &alphabet); @@ -895,8 +894,8 @@ bool ro_gui_menu_translate(struct menu_definition *menu) free(menu->menu->title_data.indirected_text.text); err = utf8_to_local_encoding(messages_get(menu->title_key), 0, &translated); - if (err != UTF8_CONVERT_OK) { - assert(err != UTF8_CONVERT_BADENC); + if (err != NSERROR_OK) { + assert(err != NSERROR_BAD_ENCODING); LOG(("utf8_to_enc failed")); return false; } @@ -912,8 +911,8 @@ bool ro_gui_menu_translate(struct menu_definition *menu) free(entry->menu_entry->data.indirected_text.text); err = utf8_to_local_encoding(messages_get(entry->entry_key), 0, &translated); - if (err != UTF8_CONVERT_OK) { - assert(err != UTF8_CONVERT_BADENC); + if (err != NSERROR_OK) { + assert(err != NSERROR_BAD_ENCODING); LOG(("utf8_to_enc failed")); return false; } |