From 7b8a2a0db72344846c177a0c3ede7170b2210907 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 12 Aug 2013 11:44:13 +0100 Subject: Use new SSL certificate viewer. --- riscos/gui.c | 2 -- riscos/sslcert.c | 14 ++++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/riscos/gui.c b/riscos/gui.c index 81b8a6309..4e6deaf7d 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -62,7 +62,6 @@ #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" @@ -944,7 +943,6 @@ void gui_quit(void) history_global_cleanup(); cookies_cleanup(); hotlist_cleanup(nsoption_charp(hotlist_save)); - sslcert_cleanup(); ro_gui_saveas_quit(); rufl_quit(); free(gui_sprites); diff --git a/riscos/sslcert.c b/riscos/sslcert.c index 2490e2e6c..9503ae946 100644 --- a/riscos/sslcert.c +++ b/riscos/sslcert.c @@ -34,6 +34,7 @@ #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 +95,6 @@ void ro_gui_cert_preinitialise(void) void ro_gui_cert_postinitialise(void) { /* Initialise the SSL module. */ - - sslcert_init(tree_content_icon_name); } /** @@ -148,6 +147,9 @@ 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()); @@ -157,10 +159,6 @@ void gui_cert_verify(nsurl *url, 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 +282,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 +301,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); } -- cgit v1.2.3