mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-25 05:27:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use new SSL certificate viewer.

Browse Source
This commit is contained in:
Michael Drake 2013-08-12 11:44:36 +01:00
parent 7b8a2a0db7
commit 40e4530433
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
amiga/gui.c
View File

@ -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);

7
amiga/sslcert.c
View File

@ -19,6 +19,7 @@
#include <proto/exec.h>
#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);
}

7
amiga/tree.c
View File

@ -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;