summaryrefslogtreecommitdiff
path: root/riscos
diff options
context:
space:
mode:
Diffstat (limited to 'riscos')
-rw-r--r--riscos/gui.c6
-rw-r--r--riscos/hotlist.c52
-rw-r--r--riscos/menus.c1
-rw-r--r--riscos/save.c4
-rw-r--r--riscos/sslcert.c17
-rw-r--r--riscos/window.c1
6 files changed, 37 insertions, 44 deletions
diff --git a/riscos/gui.c b/riscos/gui.c
index 81b8a6309..3365d813c 100644
--- a/riscos/gui.c
+++ b/riscos/gui.c
@@ -58,11 +58,10 @@
#include "desktop/cookies_old.h"
#include "desktop/gui.h"
#include "desktop/history_global_core.h"
-#include "desktop/hotlist.h"
+#include "desktop/hotlist_old.h"
#include "desktop/netsurf.h"
#include "utils/nsoption.h"
#include "desktop/save_complete.h"
-#include "desktop/sslcert.h"
#include "desktop/tree.h"
#include "desktop/tree_url_node.h"
#include "render/font.h"
@@ -943,8 +942,7 @@ void gui_quit(void)
ro_gui_window_quit();
history_global_cleanup();
cookies_cleanup();
- hotlist_cleanup(nsoption_charp(hotlist_save));
- sslcert_cleanup();
+ hotlist_old_cleanup(nsoption_charp(hotlist_save));
ro_gui_saveas_quit();
rufl_quit();
free(gui_sprites);
diff --git a/riscos/hotlist.c b/riscos/hotlist.c
index b8449cd21..fc97a0287 100644
--- a/riscos/hotlist.c
+++ b/riscos/hotlist.c
@@ -33,7 +33,7 @@
#include "content/content.h"
#include "content/hlcache.h"
#include "content/urldb.h"
-#include "desktop/hotlist.h"
+#include "desktop/hotlist_old.h"
#include "desktop/tree.h"
#include "riscos/dialog.h"
#include "riscos/hotlist.h"
@@ -131,7 +131,7 @@ void ro_gui_hotlist_postinitialise(void)
hotlist_window.tv = ro_treeview_create(hotlist_window.window,
hotlist_window.toolbar, &ro_hotlist_treeview_callbacks,
- hotlist_get_tree_flags());
+ hotlist_old_get_tree_flags());
if (hotlist_window.tv == NULL) {
LOG(("Failed to allocate treeview"));
return;
@@ -142,7 +142,7 @@ void ro_gui_hotlist_postinitialise(void)
/* Initialise the hotlist into the tree. */
- hotlist_initialise(ro_treeview_get_tree(hotlist_window.tv),
+ hotlist_old_initialise(ro_treeview_get_tree(hotlist_window.tv),
nsoption_charp(hotlist_path),
tree_directory_icon_name);
@@ -236,31 +236,31 @@ void ro_gui_hotlist_toolbar_click(button_bar_action action)
{
switch (action) {
case TOOLBAR_BUTTON_DELETE:
- hotlist_delete_selected();
+ hotlist_old_delete_selected();
break;
case TOOLBAR_BUTTON_EXPAND:
- hotlist_expand_addresses();
+ hotlist_old_expand_addresses();
break;
case TOOLBAR_BUTTON_COLLAPSE:
- hotlist_collapse_addresses();
+ hotlist_old_collapse_addresses();
break;
case TOOLBAR_BUTTON_OPEN:
- hotlist_expand_directories();
+ hotlist_old_expand_directories();
break;
case TOOLBAR_BUTTON_CLOSE:
- hotlist_collapse_directories();
+ hotlist_old_collapse_directories();
break;
case TOOLBAR_BUTTON_LAUNCH:
- hotlist_launch_selected(false);
+ hotlist_old_launch_selected(false);
break;
case TOOLBAR_BUTTON_CREATE:
- hotlist_add_folder(true);
+ hotlist_old_add_folder(true);
break;
default:
@@ -375,43 +375,43 @@ bool ro_gui_hotlist_menu_select(wimp_w w, wimp_i i, wimp_menu *menu,
ro_gui_dialog_open_persistent(w, dialog_saveas, true);
return true;
case TREE_NEW_FOLDER:
- hotlist_add_folder(true);
+ hotlist_old_add_folder(true);
return true;
case TREE_NEW_LINK:
- hotlist_add_entry(true);
+ hotlist_old_add_entry(true);
return true;
case TREE_EXPAND_ALL:
- hotlist_expand_all();
+ hotlist_old_expand_all();
return true;
case TREE_EXPAND_FOLDERS:
- hotlist_expand_directories();
+ hotlist_old_expand_directories();
return true;
case TREE_EXPAND_LINKS:
- hotlist_expand_addresses();
+ hotlist_old_expand_addresses();
return true;
case TREE_COLLAPSE_ALL:
- hotlist_collapse_all();
+ hotlist_old_collapse_all();
return true;
case TREE_COLLAPSE_FOLDERS:
- hotlist_collapse_directories();
+ hotlist_old_collapse_directories();
return true;
case TREE_COLLAPSE_LINKS:
- hotlist_collapse_addresses();
+ hotlist_old_collapse_addresses();
return true;
case TREE_SELECTION_EDIT:
- hotlist_edit_selected();
+ hotlist_old_edit_selected();
return true;
case TREE_SELECTION_LAUNCH:
- hotlist_launch_selected(false);
+ hotlist_old_launch_selected(false);
return true;
case TREE_SELECTION_DELETE:
- hotlist_delete_selected();
+ hotlist_old_delete_selected();
return true;
case TREE_SELECT_ALL:
- hotlist_select_all();
+ hotlist_old_select_all();
return true;
case TREE_CLEAR_SELECTION:
- hotlist_clear_selection();
+ hotlist_old_clear_selection();
return true;
case TOOLBAR_BUTTONS:
ro_toolbar_set_display_buttons(hotlist_window.toolbar,
@@ -482,7 +482,7 @@ void ro_gui_hotlist_add_page(const char *url)
*/
if (!nsoption_bool(external_hotlists)) {
- hotlist_add_page(url);
+ hotlist_old_add_page(url);
return;
}
@@ -543,7 +543,7 @@ static void ro_gui_hotlist_addurl_bounce(wimp_message *message)
LOG(("Hotlist AddURL Bounced"));
if (hotlist_url != NULL)
- hotlist_add_page(hotlist_url);
+ hotlist_old_add_page(hotlist_url);
ro_gui_hotlist_add_cleanup();
@@ -606,7 +606,7 @@ void ro_gui_hotlist_url_drop(wimp_message *message, const char *url)
message->data.data_xfer.pos.x,
message->data.data_xfer.pos.y,
&x, &y);
- hotlist_add_page_xy(url, x, y);
+ hotlist_old_add_page_xy(url, x, y);
}
#endif
diff --git a/riscos/menus.c b/riscos/menus.c
index bf9fa84a2..5a576f879 100644
--- a/riscos/menus.c
+++ b/riscos/menus.c
@@ -39,7 +39,6 @@
#include "desktop/gui.h"
#include "desktop/history_global_core.h"
#include "desktop/local_history.h"
-#include "desktop/hotlist.h"
#include "desktop/netsurf.h"
#include "desktop/textinput.h"
#include "riscos/dialog.h"
diff --git a/riscos/save.c b/riscos/save.c
index 390165d3b..0a9114080 100644
--- a/riscos/save.c
+++ b/riscos/save.c
@@ -37,7 +37,7 @@
#include "oslib/wimpspriteop.h"
#include "content/content.h"
#include "content/hlcache.h"
-#include "desktop/hotlist.h"
+#include "desktop/hotlist_old.h"
#include "desktop/history_global_core.h"
#include "desktop/netsurf.h"
#include "desktop/save_complete.h"
@@ -882,7 +882,7 @@ bool ro_gui_save_content(hlcache_handle *h, char *path, bool force_overwrite)
LINK_TEXT, path);
case GUI_SAVE_HOTLIST_EXPORT_HTML:
- if (!hotlist_export(path))
+ if (!hotlist_old_export(path))
return false;
error = xosfile_set_type(path, 0xfaf);
if (error)
diff --git a/riscos/sslcert.c b/riscos/sslcert.c
index 2490e2e6c..4835817da 100644
--- a/riscos/sslcert.c
+++ b/riscos/sslcert.c
@@ -33,7 +33,7 @@
#include "content/fetch.h"
#include "content/urldb.h"
#include "desktop/browser.h"
-#include "desktop/sslcert.h"
+#include "desktop/sslcert_viewer.h"
#include "desktop/gui.h"
#include "desktop/tree.h"
#include "riscos/dialog.h"
@@ -94,8 +94,6 @@ void ro_gui_cert_preinitialise(void)
void ro_gui_cert_postinitialise(void)
{
/* Initialise the SSL module. */
-
- sslcert_init(tree_content_icon_name);
}
/**
@@ -148,19 +146,18 @@ void gui_cert_verify(nsurl *url,
}
/* Create the SSL data and build a tree from it. */
+ sslcert_viewer_create_session_data(num, url,
+ cb, cbpw, certs, &sslcert_window->data);
+ ssl_current_session = sslcert_window->data;
sslcert_window->tv = ro_treeview_create(sslcert_window->pane,
- NULL, NULL, sslcert_get_tree_flags());
+ NULL, NULL, TREE_SSLCERT);
if (sslcert_window->tv == NULL) {
LOG(("Failed to allocate treeview"));
free(sslcert_window);
return;
}
- sslcert_window->data = sslcert_create_session_data(num, url, cb, cbpw);
- sslcert_load_tree(ro_treeview_get_tree(sslcert_window->tv),
- certs, sslcert_window->data);
-
tree_set_redraw(ro_treeview_get_tree(sslcert_window->tv), true);
/* Set up the certificate window event handling.
@@ -284,7 +281,7 @@ void ro_gui_cert_accept(wimp_pointer *pointer)
s = (struct ro_sslcert *) ro_gui_wimp_event_get_user_data(pointer->w);
if (s != NULL) {
- sslcert_accept(s->data);
+ sslcert_viewer_accept(s->data);
ro_gui_dialog_close(s->window);
ro_gui_cert_release_window(s);
}
@@ -303,7 +300,7 @@ void ro_gui_cert_reject(wimp_pointer *pointer)
s = (struct ro_sslcert *) ro_gui_wimp_event_get_user_data(pointer->w);
if (s != NULL) {
- sslcert_reject(s->data);
+ sslcert_viewer_reject(s->data);
ro_gui_dialog_close(s->window);
ro_gui_cert_release_window(s);
}
diff --git a/riscos/window.c b/riscos/window.c
index cbb31cf63..797176378 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -50,7 +50,6 @@
#include "desktop/scrollbar.h"
#include "desktop/frames.h"
#include "desktop/local_history.h"
-#include "desktop/hotlist.h"
#include "desktop/mouse.h"
#include "desktop/plotters.h"
#include "desktop/textinput.h"
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 04:50:38 +0000