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

Use the new ssl certificate viewer in all situations.

Browse Source
This commit is contained in:
Michael Drake 2013-08-13 14:09:15 +01:00
parent 1e64ca5f44
commit 298ac7c329
1 changed files with 51 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
desktop/tree.c
View File

@ -239,6 +239,22 @@ static bool treeview_test_init(struct tree *tree)
{
nserror err;
if (tree->flags & TREE_SSLCERT) {
treeview_inits++;
if (treeview_inits == 1)
treeview_init();
err = sslcert_viewer_init(&cw_t, (struct core_window *)tree,
ssl_current_session);
if (err != NSERROR_OK) {
warn_user("Couldn't init new sslcert viewer.", 0);
}
return true;
}
/* Check if we're testing the new treeview */
if (nsoption_bool(temp_treeview_test) == false)
return false;
@ -259,13 +275,6 @@ static bool treeview_test_init(struct tree *tree)
warn_user("Couldn't init new global history.", 0);
}
}
if (tree->flags & TREE_SSLCERT) {
err = sslcert_viewer_init(&cw_t, (struct core_window *)tree,
ssl_current_session);
if (err != NSERROR_OK) {
warn_user("Couldn't init new sslcert viewer.", 0);
}
}
return true;
}
@ -274,6 +283,20 @@ static bool treeview_test_fini(struct tree *tree)
{
nserror err;
if (tree->flags & TREE_SSLCERT) {
err = sslcert_viewer_fini(ssl_current_session);
if (err != NSERROR_OK) {
warn_user("Couldn't finalise sslcert viewer.", 0);
}
if (treeview_inits == 1)
treeview_fini();
treeview_inits--;
return true;
}
/* Check if we're testing the new treeview */
if (nsoption_bool(temp_treeview_test) == false)
return false;
@ -289,12 +312,6 @@ static bool treeview_test_fini(struct tree *tree)
warn_user("Couldn't finalise cookie manager.", 0);
}
}
if (tree->flags & TREE_SSLCERT) {
err = sslcert_viewer_fini(ssl_current_session);
if (err != NSERROR_OK) {
warn_user("Couldn't finalise sslcert viewer.", 0);
}
}
if (treeview_inits == 1)
treeview_fini();
@ -309,14 +326,20 @@ static bool treeview_test_redraw(struct tree *tree, int x, int y,
{
struct rect clip;
if (nsoption_bool(temp_treeview_test) == false)
return false;
clip.x0 = clip_x;
clip.y0 = clip_y;
clip.x1 = clip_x + clip_width;
clip.y1 = clip_y + clip_height;
if (tree->flags & TREE_SSLCERT) {
sslcert_viewer_redraw(ssl_current_session, x, y, &clip, ctx);
return true;
}
/* Check if we're testing the new treeview */
if (nsoption_bool(temp_treeview_test) == false)
return false;
if (tree->flags & TREE_COOKIES) {
cookie_manager_redraw(x, y, &clip, ctx);
return true;
@ -325,10 +348,6 @@ static bool treeview_test_redraw(struct tree *tree, int x, int y,
global_history_redraw(x, y, &clip, ctx);
return true;
}
if (tree->flags & TREE_SSLCERT) {
sslcert_viewer_redraw(ssl_current_session, x, y, &clip, ctx);
return true;
}
return false;
}
@ -336,6 +355,12 @@ static bool treeview_test_redraw(struct tree *tree, int x, int y,
static bool treeview_test_mouse_action(struct tree *tree,
browser_mouse_state mouse, int x, int y)
{
if (tree->flags & TREE_SSLCERT) {
sslcert_viewer_mouse_action(ssl_current_session, mouse, x, y);
return true;
}
/* Check if we're testing the new treeview */
if (nsoption_bool(temp_treeview_test) == false)
return false;
@ -347,16 +372,18 @@ static bool treeview_test_mouse_action(struct tree *tree,
global_history_mouse_action(mouse, x, y);
return true;
}
if (tree->flags & TREE_SSLCERT) {
sslcert_viewer_mouse_action(ssl_current_session, mouse, x, y);
return true;
}
return false;
}
static bool treeview_test_keypress(struct tree *tree, uint32_t key)
{
if (tree->flags & TREE_SSLCERT) {
sslcert_viewer_keypress(ssl_current_session, key);
return true;
}
/* Check if we're testing the new treeview */
if (nsoption_bool(temp_treeview_test) == false)
return false;
@ -368,10 +395,6 @@ static bool treeview_test_keypress(struct tree *tree, uint32_t key)
global_history_keypress(key);
return true;
}
if (tree->flags & TREE_SSLCERT) {
sslcert_viewer_keypress(ssl_current_session, key);
return true;
}
return false;
}