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

One more compilation fix for WebKit < 1.1.0 (more required)

Browse Source
This commit is contained in:
Pierre Pronchery 2011-01-01 00:45:12 +00:00
parent 41d77c9408
commit e9d8b7a27f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ghtml-webkit.c
View File

@ -143,6 +143,7 @@ GtkWidget * ghtml_new(Surfer * surfer)
static void _new_init(GHtml * ghtml) static void _new_init(GHtml * ghtml)
{ {
static int initialized = 0; static int initialized = 0;
#if WEBKIT_CHECK_VERSION(1, 1, 0)
SoupSession * session; SoupSession * session;
char const * cacerts[] = char const * cacerts[] =
{ {
@ -151,6 +152,7 @@ static void _new_init(GHtml * ghtml)
"/etc/openssl/certs/ca-certificates.crt" "/etc/openssl/certs/ca-certificates.crt"
}; };
size_t i; size_t i;
#endif
if(initialized++ == 1) if(initialized++ == 1)
{ {
@ -160,6 +162,7 @@ static void _new_init(GHtml * ghtml)
} }
else if(initialized != 1) else if(initialized != 1)
return; return;
#if WEBKIT_CHECK_VERSION(1, 1, 0)
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)
@ -169,6 +172,7 @@ static void _new_init(GHtml * ghtml)
ghtml->ssl = TRUE; ghtml->ssl = TRUE;
return; return;
} }
#endif
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++; initialized++;