DeforaOS/Surfer
DeforaOS/Surfer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed trusted connections to be reported as secure

Browse Source
This commit is contained in:
Pierre Pronchery 2010-12-21 03:11:47 +00:00
parent 7670e65c22
commit 5bf4364809
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ghtml-webkit.c
View File

@ -87,7 +87,6 @@ static void _new_init(GHtml * ghtml);
GtkWidget * ghtml_new(Surfer * surfer) GtkWidget * ghtml_new(Surfer * surfer)
{ {
static int initialized = 0;
GHtml * ghtml; GHtml * ghtml;
GtkWidget * widget; GtkWidget * widget;
@ -136,14 +135,13 @@ GtkWidget * ghtml_new(Surfer * surfer)
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(widget), gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(widget),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_container_add(GTK_CONTAINER(widget), ghtml->view); gtk_container_add(GTK_CONTAINER(widget), ghtml->view);
if(initialized++ == 0)
_new_init(ghtml); _new_init(ghtml);
initialized = 1;
return widget; return widget;
} }
static void _new_init(GHtml * ghtml) static void _new_init(GHtml * ghtml)
{ {
static int initialized = 0;
SoupSession * session; SoupSession * session;
char const * cacerts[] = char const * cacerts[] =
{ {
@ -153,6 +151,14 @@ static void _new_init(GHtml * ghtml)
}; };
size_t i; size_t i;
if(initialized++ == 1)
{
ghtml->ssl = TRUE;
initialized = 1;
return;
}
else if(initialized != 1)
return;
session = webkit_get_default_session(); session = webkit_get_default_session();
for(i = 0; i < sizeof(cacerts) / sizeof(*cacerts); i++) for(i = 0; i < sizeof(cacerts) / sizeof(*cacerts); i++)
if(access(cacerts[i], R_OK) == 0) if(access(cacerts[i], R_OK) == 0)
@ -164,6 +170,7 @@ static void _new_init(GHtml * ghtml)
} }
surfer_warning(ghtml->surfer, "Could not load certificate bundle:\n" surfer_warning(ghtml->surfer, "Could not load certificate bundle:\n"
"SSL certificates will not be verified."); "SSL certificates will not be verified.");
initialized++;
} }