From a0d511734ae464d6e7b4d2f5e019611c0cdafea9 Mon Sep 17 00:00:00 2001 From: John Tytgat Date: Mon, 5 Jul 2004 20:19:52 +0000 Subject: [project @ 2004-07-05 20:19:51 by joty] Using UTF-8 instead of Latin1 encoding. svn path=/import/netsurf/; revision=1049 --- riscos/menus.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'riscos/menus.c') diff --git a/riscos/menus.c b/riscos/menus.c index b64d56798..bc4c7ef37 100644 --- a/riscos/menus.c +++ b/riscos/menus.c @@ -1150,9 +1150,12 @@ void ro_gui_menu_pageinfo(wimp_message_menu_warning *warning) const char *enc = "-"; const char *mime = "-"; - if (c->title != 0) title = c->title; - if (c->url != 0) url = c->url; - if (c->mime_type != 0) mime = c->mime_type; + if (c->title != NULL) + title = cnv_str_local_enc(c->title); + if (c->url != NULL) + url = c->url; + if (c->mime_type != NULL) + mime = c->mime_type; sprintf(icon_buf, "file_%x", ro_content_filetype(c)); @@ -1166,6 +1169,9 @@ void ro_gui_menu_pageinfo(wimp_message_menu_warning *warning) ro_gui_set_icon_string(dialog_pageinfo, ICON_PAGEINFO_ENC, enc); ro_gui_set_icon_string(dialog_pageinfo, ICON_PAGEINFO_TYPE, mime); + if (title != NULL) + free(title); + error = xwimp_create_sub_menu((wimp_menu *) dialog_pageinfo, warning->pos.x, warning->pos.y); if (error) { -- cgit v1.2.3