From c40fc354b3783502ce0c9be1629380acb10c0570 Mon Sep 17 00:00:00 2001 From: John Tytgat Date: Tue, 5 Aug 2008 01:23:04 +0000 Subject: - 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 --- riscos/hotlist.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'riscos/hotlist.c') diff --git a/riscos/hotlist.c b/riscos/hotlist.c index fee9f2d41..415071864 100644 --- a/riscos/hotlist.c +++ b/riscos/hotlist.c @@ -249,7 +249,7 @@ void ro_gui_hotlist_prepare_folder_dialog(struct node *node) name = messages_get("Folder"); } ro_gui_set_window_title(dialog_folder, title); - ro_gui_set_icon_string(dialog_folder, ICON_FOLDER_NAME, name); + ro_gui_set_icon_string(dialog_folder, ICON_FOLDER_NAME, name, true); ro_gui_wimp_event_memorise(dialog_folder); } @@ -277,8 +277,8 @@ void ro_gui_hotlist_prepare_entry_dialog(struct node *node) name = messages_get("Link"); } ro_gui_set_window_title(dialog_entry, title); - ro_gui_set_icon_string(dialog_entry, ICON_ENTRY_NAME, name); - ro_gui_set_icon_string(dialog_entry, ICON_ENTRY_URL, url); + ro_gui_set_icon_string(dialog_entry, ICON_ENTRY_NAME, name, true); + ro_gui_set_icon_string(dialog_entry, ICON_ENTRY_URL, url, true); ro_gui_wimp_event_memorise(dialog_entry); } @@ -326,7 +326,7 @@ bool ro_gui_hotlist_dialog_apply(wimp_w w) return false; } ro_gui_set_icon_string(w, - (url ? ICON_ENTRY_NAME : ICON_FOLDER_NAME), title); + url ? ICON_ENTRY_NAME : ICON_FOLDER_NAME, title, true); /* update/insert our data */ if (!node) { @@ -366,7 +366,7 @@ bool ro_gui_hotlist_dialog_apply(wimp_w w) if (element) { free((void *)element->text); element->text = url; - ro_gui_set_icon_string(w, ICON_ENTRY_URL, url); + ro_gui_set_icon_string(w, ICON_ENTRY_URL, url, true); } free((void *)node->data.text); node->data.text = title; -- cgit v1.2.3