Enabled frame flattening with WebKit when compiled in embedded mode
This commit is contained in:
parent
5e2eb9d57b
commit
55a3d621e8
12
po/de.po
12
po/de.po
@ -7,7 +7,7 @@ msgid ""
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Surfer 0.1.0\n"
|
"Project-Id-Version: Surfer 0.1.0\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2011-07-19 19:20+0200\n"
|
"POT-Creation-Date: 2011-07-19 22:52+0200\n"
|
||||||
"PO-Revision-Date: 2010-04-01 19:40+0200\n"
|
"PO-Revision-Date: 2010-04-01 19:40+0200\n"
|
||||||
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
|
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
|
||||||
"Language-Team: German\n"
|
"Language-Team: German\n"
|
||||||
@ -36,8 +36,8 @@ msgid "Connected"
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:971
|
#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:971
|
||||||
#: ../src/ghtml-webkit.c:613 ../src/ghtml-webkit.c:754
|
#: ../src/ghtml-webkit.c:620 ../src/ghtml-webkit.c:761
|
||||||
#: ../src/ghtml-webkit.c:766
|
#: ../src/ghtml-webkit.c:773
|
||||||
msgid "Downloading..."
|
msgid "Downloading..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
@ -149,7 +149,7 @@ msgstr ""
|
|||||||
msgid "Code "
|
msgid "Code "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../src/download.c:707 ../src/ghtml-webkit.c:712 ../src/surfer.c:1014
|
#: ../src/download.c:707 ../src/ghtml-webkit.c:719 ../src/surfer.c:1014
|
||||||
msgid "Unknown error"
|
msgid "Unknown error"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
@ -176,8 +176,8 @@ msgstr ""
|
|||||||
msgid "Redirecting to "
|
msgid "Redirecting to "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../src/ghtml-gtkhtml.c:1083 ../src/ghtml-webkit.c:470
|
#: ../src/ghtml-gtkhtml.c:1083 ../src/ghtml-webkit.c:477
|
||||||
#: ../src/ghtml-webkit.c:611
|
#: ../src/ghtml-webkit.c:618
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
12
po/es.po
12
po/es.po
@ -7,7 +7,7 @@ msgid ""
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Surfer 0.1.0\n"
|
"Project-Id-Version: Surfer 0.1.0\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2011-07-19 19:20+0200\n"
|
"POT-Creation-Date: 2011-07-19 22:52+0200\n"
|
||||||
"PO-Revision-Date: 2010-04-01 19:40+0200\n"
|
"PO-Revision-Date: 2010-04-01 19:40+0200\n"
|
||||||
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
|
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
|
||||||
"Language-Team: Spanish\n"
|
"Language-Team: Spanish\n"
|
||||||
@ -36,8 +36,8 @@ msgid "Connected"
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:971
|
#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:971
|
||||||
#: ../src/ghtml-webkit.c:613 ../src/ghtml-webkit.c:754
|
#: ../src/ghtml-webkit.c:620 ../src/ghtml-webkit.c:761
|
||||||
#: ../src/ghtml-webkit.c:766
|
#: ../src/ghtml-webkit.c:773
|
||||||
msgid "Downloading..."
|
msgid "Downloading..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
@ -149,7 +149,7 @@ msgstr ""
|
|||||||
msgid "Code "
|
msgid "Code "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../src/download.c:707 ../src/ghtml-webkit.c:712 ../src/surfer.c:1014
|
#: ../src/download.c:707 ../src/ghtml-webkit.c:719 ../src/surfer.c:1014
|
||||||
msgid "Unknown error"
|
msgid "Unknown error"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
@ -176,8 +176,8 @@ msgstr ""
|
|||||||
msgid "Redirecting to "
|
msgid "Redirecting to "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../src/ghtml-gtkhtml.c:1083 ../src/ghtml-webkit.c:470
|
#: ../src/ghtml-gtkhtml.c:1083 ../src/ghtml-webkit.c:477
|
||||||
#: ../src/ghtml-webkit.c:611
|
#: ../src/ghtml-webkit.c:618
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
12
po/fr.po
12
po/fr.po
@ -7,7 +7,7 @@ msgid ""
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Surfer 0.1.0\n"
|
"Project-Id-Version: Surfer 0.1.0\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2011-07-19 19:20+0200\n"
|
"POT-Creation-Date: 2011-07-19 22:52+0200\n"
|
||||||
"PO-Revision-Date: 2010-04-01 19:40+0200\n"
|
"PO-Revision-Date: 2010-04-01 19:40+0200\n"
|
||||||
"Last-Translator: Calimero <calimeroteknik@free.fr>\n"
|
"Last-Translator: Calimero <calimeroteknik@free.fr>\n"
|
||||||
"Language-Team: French\n"
|
"Language-Team: French\n"
|
||||||
@ -38,8 +38,8 @@ msgid "Connected"
|
|||||||
msgstr "Connecté"
|
msgstr "Connecté"
|
||||||
|
|
||||||
#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:971
|
#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:971
|
||||||
#: ../src/ghtml-webkit.c:613 ../src/ghtml-webkit.c:754
|
#: ../src/ghtml-webkit.c:620 ../src/ghtml-webkit.c:761
|
||||||
#: ../src/ghtml-webkit.c:766
|
#: ../src/ghtml-webkit.c:773
|
||||||
msgid "Downloading..."
|
msgid "Downloading..."
|
||||||
msgstr "Téléchargement..."
|
msgstr "Téléchargement..."
|
||||||
|
|
||||||
@ -151,7 +151,7 @@ msgstr "Résolu"
|
|||||||
msgid "Code "
|
msgid "Code "
|
||||||
msgstr "Code "
|
msgstr "Code "
|
||||||
|
|
||||||
#: ../src/download.c:707 ../src/ghtml-webkit.c:712 ../src/surfer.c:1014
|
#: ../src/download.c:707 ../src/ghtml-webkit.c:719 ../src/surfer.c:1014
|
||||||
msgid "Unknown error"
|
msgid "Unknown error"
|
||||||
msgstr "Erreur inconnue"
|
msgstr "Erreur inconnue"
|
||||||
|
|
||||||
@ -181,8 +181,8 @@ msgstr "Redirection..."
|
|||||||
msgid "Redirecting to "
|
msgid "Redirecting to "
|
||||||
msgstr "Redirection vers "
|
msgstr "Redirection vers "
|
||||||
|
|
||||||
#: ../src/ghtml-gtkhtml.c:1083 ../src/ghtml-webkit.c:470
|
#: ../src/ghtml-gtkhtml.c:1083 ../src/ghtml-webkit.c:477
|
||||||
#: ../src/ghtml-webkit.c:611
|
#: ../src/ghtml-webkit.c:618
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "Connexion..."
|
msgstr "Connexion..."
|
||||||
|
|
||||||
|
12
po/it.po
12
po/it.po
@ -7,7 +7,7 @@ msgid ""
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Surfer 0.1.0\n"
|
"Project-Id-Version: Surfer 0.1.0\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2011-07-19 19:20+0200\n"
|
"POT-Creation-Date: 2011-07-19 22:52+0200\n"
|
||||||
"PO-Revision-Date: 2010-04-11 12:06+0200\n"
|
"PO-Revision-Date: 2010-04-11 12:06+0200\n"
|
||||||
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
|
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
|
||||||
"Language-Team: Italian\n"
|
"Language-Team: Italian\n"
|
||||||
@ -36,8 +36,8 @@ msgid "Connected"
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:971
|
#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:971
|
||||||
#: ../src/ghtml-webkit.c:613 ../src/ghtml-webkit.c:754
|
#: ../src/ghtml-webkit.c:620 ../src/ghtml-webkit.c:761
|
||||||
#: ../src/ghtml-webkit.c:766
|
#: ../src/ghtml-webkit.c:773
|
||||||
msgid "Downloading..."
|
msgid "Downloading..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
@ -149,7 +149,7 @@ msgstr ""
|
|||||||
msgid "Code "
|
msgid "Code "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../src/download.c:707 ../src/ghtml-webkit.c:712 ../src/surfer.c:1014
|
#: ../src/download.c:707 ../src/ghtml-webkit.c:719 ../src/surfer.c:1014
|
||||||
msgid "Unknown error"
|
msgid "Unknown error"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
@ -176,8 +176,8 @@ msgstr ""
|
|||||||
msgid "Redirecting to "
|
msgid "Redirecting to "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../src/ghtml-gtkhtml.c:1083 ../src/ghtml-webkit.c:470
|
#: ../src/ghtml-gtkhtml.c:1083 ../src/ghtml-webkit.c:477
|
||||||
#: ../src/ghtml-webkit.c:611
|
#: ../src/ghtml-webkit.c:618
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -144,6 +144,9 @@ static void _new_init(GHtml * ghtml)
|
|||||||
static int initialized = 0;
|
static int initialized = 0;
|
||||||
#if WEBKIT_CHECK_VERSION(1, 1, 0)
|
#if WEBKIT_CHECK_VERSION(1, 1, 0)
|
||||||
SoupSession * session;
|
SoupSession * session;
|
||||||
|
# if WEBKIT_CHECK_VERSION(1, 3, 5) && defined(EMBEDDED)
|
||||||
|
WebKitWebSettings * settings;
|
||||||
|
# endif
|
||||||
char const * cacerts[] =
|
char const * cacerts[] =
|
||||||
{
|
{
|
||||||
"/etc/pki/tls/certs/ca-bundle.crt",
|
"/etc/pki/tls/certs/ca-bundle.crt",
|
||||||
@ -163,6 +166,10 @@ static void _new_init(GHtml * ghtml)
|
|||||||
return;
|
return;
|
||||||
#if WEBKIT_CHECK_VERSION(1, 1, 0)
|
#if WEBKIT_CHECK_VERSION(1, 1, 0)
|
||||||
session = webkit_get_default_session();
|
session = webkit_get_default_session();
|
||||||
|
# if WEBKIT_CHECK_VERSION(1, 3, 5) && defined(EMBEDDED)
|
||||||
|
settings = webkit_web_view_get_settings(WEBKIT_WEB_VIEW(ghtml->view));
|
||||||
|
g_object_set(settings, "enable-frame-flattening", TRUE, NULL);
|
||||||
|
# endif
|
||||||
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)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user