From 40e453043396ccc2f09f0bb705425026a71ce921 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 12 Aug 2013 11:44:36 +0100 Subject: Use new SSL certificate viewer. --- amiga/gui.c | 2 -- amiga/sslcert.c | 7 ++++--- amiga/tree.c | 7 ++++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/amiga/gui.c b/amiga/gui.c index bbc42683e..c41df4288 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -812,7 +812,6 @@ static void gui_init2(int argc, char** argv) ami_hotlist_initialise(nsoption_charp(hotlist_file)); ami_cookies_initialise(); ami_global_history_initialise(); - sslcert_init(tree_content_icon_name); search_web_provider_details(nsoption_int(search_provider)); @@ -2772,7 +2771,6 @@ void gui_quit(void) ami_hotlist_free(nsoption_charp(hotlist_file)); ami_cookies_free(); ami_global_history_free(); - sslcert_cleanup(); if(IApplication && ami_appid) UnregisterApplication(ami_appid, NULL); diff --git a/amiga/sslcert.c b/amiga/sslcert.c index dcf9a6d7d..c07ed0b7d 100644 --- a/amiga/sslcert.c +++ b/amiga/sslcert.c @@ -19,6 +19,7 @@ #include #include "amiga/tree.h" #include "amiga/sslcert.h" +#include "desktop/sslcert_viewer.h" void gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs, unsigned long num, @@ -27,13 +28,13 @@ void gui_cert_verify(nsurl *url, struct sslcert_session_data *data; struct treeview_window *ssl_window; - data = sslcert_create_session_data(num, url, cb, cbpw); + sslcert_viewer_create_session_data(num, url, cb, cbpw, + certs, &data); + ssl_current_session = data; ssl_window = ami_tree_create(sslcert_get_tree_flags(), data); if(!ssl_window) return; - sslcert_load_tree(ami_tree_get_tree(ssl_window), certs, data); - ami_tree_open(ssl_window, AMI_TREE_SSLCERT); } diff --git a/amiga/tree.c b/amiga/tree.c index 9c7305dac..327e91195 100644 --- a/amiga/tree.c +++ b/amiga/tree.c @@ -58,6 +58,7 @@ #include "desktop/cookies_old.h" #include "desktop/history_global_core.h" #include "desktop/hotlist.h" +#include "desktop/sslcert_viewer.h" #include "desktop/tree_url_node.h" #include "utils/utils.h" #include "utils/messages.h" @@ -757,13 +758,13 @@ BOOL ami_tree_event(struct treeview_window *twin) switch(result & WMHI_GADGETMASK) { case GID_OPEN: - sslcert_accept(twin->ssl_data); + sslcert_viewer_accept(twin->ssl_data); ami_tree_close(twin); return TRUE; break; case GID_CANCEL: - sslcert_reject(twin->ssl_data); + sslcert_viewer_reject(twin->ssl_data); ami_tree_close(twin); return TRUE; break; @@ -1215,7 +1216,7 @@ BOOL ami_tree_event(struct treeview_window *twin) case WMHI_CLOSEWINDOW: if(twin->type == AMI_TREE_SSLCERT) - sslcert_reject(twin->ssl_data); + sslcert_viewer_reject(twin->ssl_data); ami_tree_close(twin); return TRUE; break; -- cgit v1.2.3