From 55a3d621e838b9e16106e839fe803b29a48d0505 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Tue, 19 Jul 2011 20:56:47 +0000 Subject: [PATCH] Enabled frame flattening with WebKit when compiled in embedded mode --- po/de.po | 12 ++++++------ po/es.po | 12 ++++++------ po/fr.po | 12 ++++++------ po/it.po | 12 ++++++------ src/ghtml-webkit.c | 7 +++++++ 5 files changed, 31 insertions(+), 24 deletions(-) diff --git a/po/de.po b/po/de.po index 99b1024..d66e8a0 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Surfer 0.1.0\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" "Last-Translator: Pierre Pronchery \n" "Language-Team: German\n" @@ -36,8 +36,8 @@ msgid "Connected" msgstr "" #: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:971 -#: ../src/ghtml-webkit.c:613 ../src/ghtml-webkit.c:754 -#: ../src/ghtml-webkit.c:766 +#: ../src/ghtml-webkit.c:620 ../src/ghtml-webkit.c:761 +#: ../src/ghtml-webkit.c:773 msgid "Downloading..." msgstr "" @@ -149,7 +149,7 @@ msgstr "" msgid "Code " 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" msgstr "" @@ -176,8 +176,8 @@ msgstr "" msgid "Redirecting to " msgstr "" -#: ../src/ghtml-gtkhtml.c:1083 ../src/ghtml-webkit.c:470 -#: ../src/ghtml-webkit.c:611 +#: ../src/ghtml-gtkhtml.c:1083 ../src/ghtml-webkit.c:477 +#: ../src/ghtml-webkit.c:618 msgid "Connecting..." msgstr "" diff --git a/po/es.po b/po/es.po index cf4c2bd..05466c3 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Surfer 0.1.0\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" "Last-Translator: Pierre Pronchery \n" "Language-Team: Spanish\n" @@ -36,8 +36,8 @@ msgid "Connected" msgstr "" #: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:971 -#: ../src/ghtml-webkit.c:613 ../src/ghtml-webkit.c:754 -#: ../src/ghtml-webkit.c:766 +#: ../src/ghtml-webkit.c:620 ../src/ghtml-webkit.c:761 +#: ../src/ghtml-webkit.c:773 msgid "Downloading..." msgstr "" @@ -149,7 +149,7 @@ msgstr "" msgid "Code " 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" msgstr "" @@ -176,8 +176,8 @@ msgstr "" msgid "Redirecting to " msgstr "" -#: ../src/ghtml-gtkhtml.c:1083 ../src/ghtml-webkit.c:470 -#: ../src/ghtml-webkit.c:611 +#: ../src/ghtml-gtkhtml.c:1083 ../src/ghtml-webkit.c:477 +#: ../src/ghtml-webkit.c:618 msgid "Connecting..." msgstr "" diff --git a/po/fr.po b/po/fr.po index ae85994..86edbe1 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Surfer 0.1.0\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" "Last-Translator: Calimero \n" "Language-Team: French\n" @@ -38,8 +38,8 @@ msgid "Connected" msgstr "Connecté" #: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:971 -#: ../src/ghtml-webkit.c:613 ../src/ghtml-webkit.c:754 -#: ../src/ghtml-webkit.c:766 +#: ../src/ghtml-webkit.c:620 ../src/ghtml-webkit.c:761 +#: ../src/ghtml-webkit.c:773 msgid "Downloading..." msgstr "Téléchargement..." @@ -151,7 +151,7 @@ msgstr "Résolu" msgid "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" msgstr "Erreur inconnue" @@ -181,8 +181,8 @@ msgstr "Redirection..." msgid "Redirecting to " msgstr "Redirection vers " -#: ../src/ghtml-gtkhtml.c:1083 ../src/ghtml-webkit.c:470 -#: ../src/ghtml-webkit.c:611 +#: ../src/ghtml-gtkhtml.c:1083 ../src/ghtml-webkit.c:477 +#: ../src/ghtml-webkit.c:618 msgid "Connecting..." msgstr "Connexion..." diff --git a/po/it.po b/po/it.po index a709869..c65a521 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Surfer 0.1.0\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" "Last-Translator: Pierre Pronchery \n" "Language-Team: Italian\n" @@ -36,8 +36,8 @@ msgid "Connected" msgstr "" #: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:971 -#: ../src/ghtml-webkit.c:613 ../src/ghtml-webkit.c:754 -#: ../src/ghtml-webkit.c:766 +#: ../src/ghtml-webkit.c:620 ../src/ghtml-webkit.c:761 +#: ../src/ghtml-webkit.c:773 msgid "Downloading..." msgstr "" @@ -149,7 +149,7 @@ msgstr "" msgid "Code " 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" msgstr "" @@ -176,8 +176,8 @@ msgstr "" msgid "Redirecting to " msgstr "" -#: ../src/ghtml-gtkhtml.c:1083 ../src/ghtml-webkit.c:470 -#: ../src/ghtml-webkit.c:611 +#: ../src/ghtml-gtkhtml.c:1083 ../src/ghtml-webkit.c:477 +#: ../src/ghtml-webkit.c:618 msgid "Connecting..." msgstr "" diff --git a/src/ghtml-webkit.c b/src/ghtml-webkit.c index a54cdc6..135b688 100644 --- a/src/ghtml-webkit.c +++ b/src/ghtml-webkit.c @@ -144,6 +144,9 @@ static void _new_init(GHtml * ghtml) static int initialized = 0; #if WEBKIT_CHECK_VERSION(1, 1, 0) SoupSession * session; +# if WEBKIT_CHECK_VERSION(1, 3, 5) && defined(EMBEDDED) + WebKitWebSettings * settings; +# endif char const * cacerts[] = { "/etc/pki/tls/certs/ca-bundle.crt", @@ -163,6 +166,10 @@ static void _new_init(GHtml * ghtml) return; #if WEBKIT_CHECK_VERSION(1, 1, 0) 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++) if(access(cacerts[i], R_OK) == 0) {