diff options
author | John Tytgat <joty@netsurf-browser.org> | 2008-08-05 01:23:04 +0000 |
---|---|---|
committer | John Tytgat <joty@netsurf-browser.org> | 2008-08-05 01:23:04 +0000 |
commit | c40fc354b3783502ce0c9be1629380acb10c0570 (patch) | |
tree | 27076646b9e6041439a5e082b1cb99d67045b0ac /riscos/menus.c | |
parent | 039362166c2d31dd23931332b6af94bf274d2635 (diff) | |
download | netsurf-c40fc354b3783502ce0c9be1629380acb10c0570.tar.gz netsurf-c40fc354b3783502ce0c9be1629380acb10c0570.tar.bz2 |
- Teached ro_gui_set_icon_string() and ro_gui_get_icon_string() about the difference between direct and indirect icons.
- ro_gui_get_icon_string():
- Constify return value of ro_gui_get_icon_string() as you really shouldn't change its contents via this pointer.
- Enfore NUL string termination as return value (instead of other control char termination)
- Merged ro_gui_set_icon_string_le() into ro_gui_set_icon_string() by adding ro_gui_set_icon_string() and extra to_utf8 parameter.
- ro_gui_strncmp(): added
svn path=/trunk/netsurf/; revision=4907
Diffstat (limited to 'riscos/menus.c')
-rw-r--r-- | riscos/menus.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/riscos/menus.c b/riscos/menus.c index 7bd248baf..9c2dfffda 100644 --- a/riscos/menus.c +++ b/riscos/menus.c @@ -904,11 +904,11 @@ void ro_gui_menu_prepare_pageinfo(struct gui_window *g) } } - ro_gui_set_icon_string(dialog_pageinfo, ICON_PAGEINFO_ICON, icon); - ro_gui_set_icon_string(dialog_pageinfo, ICON_PAGEINFO_TITLE, title); - ro_gui_set_icon_string(dialog_pageinfo, ICON_PAGEINFO_URL, url); - ro_gui_set_icon_string(dialog_pageinfo, ICON_PAGEINFO_ENC, enc); - ro_gui_set_icon_string(dialog_pageinfo, ICON_PAGEINFO_TYPE, mime); + ro_gui_set_icon_string(dialog_pageinfo, ICON_PAGEINFO_ICON, icon, true); + ro_gui_set_icon_string(dialog_pageinfo, ICON_PAGEINFO_TITLE, title, true); + ro_gui_set_icon_string(dialog_pageinfo, ICON_PAGEINFO_URL, url, true); + ro_gui_set_icon_string(dialog_pageinfo, ICON_PAGEINFO_ENC, enc, true); + ro_gui_set_icon_string(dialog_pageinfo, ICON_PAGEINFO_TYPE, mime, true); } @@ -936,10 +936,10 @@ void ro_gui_menu_prepare_objectinfo(struct box *box) if (box->object->mime_type) mime = box->object->mime_type; - ro_gui_set_icon_string(dialog_objinfo, ICON_OBJINFO_ICON, icon_buf); - ro_gui_set_icon_string(dialog_objinfo, ICON_OBJINFO_URL, url); - ro_gui_set_icon_string(dialog_objinfo, ICON_OBJINFO_TARGET, target); - ro_gui_set_icon_string(dialog_objinfo, ICON_OBJINFO_TYPE, mime); + ro_gui_set_icon_string(dialog_objinfo, ICON_OBJINFO_ICON, icon_buf, true); + ro_gui_set_icon_string(dialog_objinfo, ICON_OBJINFO_URL, url, true); + ro_gui_set_icon_string(dialog_objinfo, ICON_OBJINFO_TARGET, target, true); + ro_gui_set_icon_string(dialog_objinfo, ICON_OBJINFO_TYPE, mime, true); } |